@yuneta/gobj-js 7.26.0 → 7.26.2

package/README.md

@@ -610,9 +610,10 @@ kw_clone_by_not_keys(gobj, kw, keys, verbose)
 // A filter value is compared as a value: {online: false}, {channel: 0}
 // and {name: ""} match (up to 7.25.9 a false value never did):
 //   kw_select(null, [{id: "a", online: false}], {online: false})  → [{id: "a", ...}]
-// A key that names the prototype ("__proto__", "constructor",
-// "prototype") is a key like any other, as in C: it is read only when the
-// kw holds it, and written as the kw's own key, never into Object.prototype.
+// A key is read only when the kw OWNS it ("toString" or "constructor" on
+// a plain {} are not there) and written as its own key, "__proto__"
+// included, as in C: never into a prototype. The helpers that copy
+// (json_object_update(), kw_clone_by_*(), flat_apply()...) do the same.
 
 // Flags: KW_REQUIRED, KW_CREATE, KW_EXTRACT, KW_RECURSIVE, KW_WILD_NUMBER
 

package/dist/gobj-js.cjs.js

@@ -895,17 +895,20 @@ 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) {
-				jn_value2 = jn_value_;
+			if (is_string(jn_value_)) {
+				const t = jn_value_.trim();
+				if (t.startsWith("{") || t.startsWith("[")) try {
+					jn_value2 = JSON.parse(t);
+				} catch (error) {
+					jn_value2 = jn_value_;
+				}
 			}
 			break;
 		case data_type_t.DTP_POINTER: jn_value2 = jn_value_;
 	}
 	if (jn_value2 === void 0) log_error(`${gobj_short_name(gobj)}: attr undefined: ${it.name}`);
 	sdata[it.name] = jn_value2;
-	if (is_object(gobj.priv) && gobj.priv.hasOwnProperty(it.name)) gobj.priv[it.name] = jn_value2;
+	if (is_object(gobj.priv) && Object.prototype.hasOwnProperty.call(gobj.priv, it.name)) gobj.priv[it.name] = jn_value2;
 	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, it.name);
 	}
@@ -2108,7 +2111,7 @@ function gobj_has_attr(gobj, name) {
 function gobj_read_attr(gobj, name, src) {
 	let jn_attrs = gobj.jn_attrs;
 	if (name in jn_attrs) {
-		if (jn_attrs.hasOwnProperty(name)) {
+		if (Object.prototype.hasOwnProperty.call(jn_attrs, name)) {
 			let value = jn_attrs[name];
 			if (gobj.gclass.gmt.mt_reading) return gobj.gclass.gmt.mt_reading(gobj, name, value);
 			return value;
@@ -2214,9 +2217,9 @@ function gobj_write_attr(gobj, path, value, src) {
 	if (ss.length <= 1) {
 		let key = path;
 		if (key in jn_attrs) {
-			if (jn_attrs.hasOwnProperty(key)) {
+			if (Object.prototype.hasOwnProperty.call(jn_attrs, key)) {
 				jn_attrs[key] = value;
-				if (is_object(gobj.priv) && gobj.priv.hasOwnProperty(key)) gobj.priv[key] = value;
+				if (is_object(gobj.priv) && Object.prototype.hasOwnProperty.call(gobj.priv, key)) gobj.priv[key] = value;
 				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, key);
 				}
@@ -2237,9 +2240,9 @@ function gobj_write_attr(gobj, path, value, src) {
 		}
 		let jn_attrs = gobj.jn_attrs;
 		if (key in jn_attrs) {
-			if (jn_attrs.hasOwnProperty(key)) {
+			if (Object.prototype.hasOwnProperty.call(jn_attrs, key)) {
 				jn_attrs[key] = value;
-				if (is_object(gobj.priv) && gobj.priv.hasOwnProperty(key)) gobj.priv[key] = value;
+				if (is_object(gobj.priv) && Object.prototype.hasOwnProperty.call(gobj.priv, key)) gobj.priv[key] = value;
 				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, key);
 				}
@@ -2266,7 +2269,7 @@ function sdata_write_default_values(gobj, include_flag, exclude_flag) {
 		if (exclude_flag && it.flag & exclude_flag) continue;
 		if (include_flag === -1 || it.flag & include_flag) {
 			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 (is_object(gobj.priv) && Object.prototype.hasOwnProperty.call(gobj.priv, 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);
 		}
 	}
@@ -2300,7 +2303,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] = hs[name];
+		if (is_object(gobj.priv) && Object.prototype.hasOwnProperty.call(gobj.priv, 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);
 		}
@@ -2316,7 +2319,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] = hs[name];
+		if (is_object(gobj.priv) && Object.prototype.hasOwnProperty.call(gobj.priv, 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);
 		}
@@ -2332,7 +2335,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] = hs[name];
+		if (is_object(gobj.priv) && Object.prototype.hasOwnProperty.call(gobj.priv, 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);
 		}
@@ -2599,7 +2602,7 @@ function gobj_send_event(dst, event, kw, src) {
 	} 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}`);
+			log_error(`${gobj_short_name(dst)}: action of ${event} in ${state.state_name} THREW: ${e && e.stack ? e.stack : e}`);
 			try {
 				e.__gobj_logged__ = true;
 			} catch (e2) {}
@@ -2720,8 +2723,8 @@ function _subscription_match_kw(kw, event) {
 		kw,
 		renamed_event: ""
 	};
-	let kw_match = Object.assign({}, kw);
-	let config_match = Object.assign({}, __config__);
+	let kw_match = json_object_update({}, kw);
+	let config_match = json_object_update({}, __config__);
 	kw_match.__config__ = config_match;
 	let renamed_event = "";
 	let rename = config_match.__rename_event_name__;
@@ -2729,7 +2732,7 @@ function _subscription_match_kw(kw, event) {
 	if (event_type) {
 		renamed_event = event_type.event_name;
 		delete config_match.__rename_event_name__;
-		if (event && json_size(kw_match.__global__) > 0) kw_match.__global__ = Object.assign({}, kw_match.__global__, { __original_event_name__: event });
+		if (event && json_size(kw_match.__global__) > 0) kw_match.__global__ = json_object_update(json_object_update({}, kw_match.__global__), { __original_event_name__: event });
 	}
 	delete config_match.__hard_subscription__;
 	delete config_match.__own_event__;
@@ -3105,7 +3108,7 @@ function gobj_publish_event(publisher, event, kw) {
 				}
 			}
 			let kw2publish = kw;
-			if (json_size(__local__) > 0 || json_size(__global__) > 0) kw2publish = Object.assign({}, kw);
+			if (json_size(__local__) > 0 || json_size(__global__) > 0) kw2publish = json_object_update({}, kw);
 			if (json_size(__local__) > 0) kw_pop(kw2publish, __local__);
 			if (__config__) {}
 			if (json_size(__global__) > 0) json_object_update(kw2publish, json_deep_copy(__global__));
@@ -3607,7 +3610,7 @@ function _json_mask_secrets(jn, memo, depth, budget) {
 			if ((is_secret_name(key.slice(-128)) || value_is_secret && key === "value") && value !== void 0 && value !== null && value !== "") shown = "********";
 			else shown = _json_mask_secrets(value, memo, depth + 1, budget);
 			if (shown !== value) changed = true;
-			result[key] = shown;
+			set_own_key(result, key, shown);
 		}
 		if (truncated) result["<more>"] = MASK_TOO_LARGE;
 	}
@@ -3642,10 +3645,7 @@ function json_deep_copy(obj) {
 ************************************************************/
 function duplicate_objects(...sourceObjects) {
 	const result = {};
-	for (const obj of sourceObjects) {
-		const clonedObj = structuredClone(obj);
-		Object.assign(result, clonedObj);
-	}
+	for (const obj of sourceObjects) json_object_update(result, structuredClone(obj));
 	return result;
 }
 /************************************************************
@@ -3679,7 +3679,7 @@ function json_is_identical(kw1, kw2) {
 ************************************************************/
 function json_object_update(destination, source) {
 	if (!source) return destination;
-	for (let property of Object.keys(source)) destination[property] = source[property];
+	for (let property of Object.keys(source)) set_own_key(destination, property, source[property]);
 	return destination;
 }
 /************************************************************
@@ -3688,7 +3688,7 @@ function json_object_update(destination, source) {
 ************************************************************/
 function json_object_update_existing(destination, source) {
 	if (!source) return destination;
-	for (let property in source) if (source.hasOwnProperty(property) && destination.hasOwnProperty(property)) destination[property] = source[property];
+	for (let property in source) if (Object.prototype.hasOwnProperty.call(source, property) && Object.prototype.hasOwnProperty.call(destination, property)) set_own_key(destination, property, source[property]);
 	return destination;
 }
 /************************************************************
@@ -3697,32 +3697,32 @@ function json_object_update_existing(destination, source) {
 ************************************************************/
 function json_object_update_missing(destination, source) {
 	if (!source) return destination;
-	for (let property in source) if (source.hasOwnProperty(property) && !destination.hasOwnProperty(property)) destination[property] = source[property];
+	for (let property in source) if (Object.prototype.hasOwnProperty.call(source, property) && !Object.prototype.hasOwnProperty.call(destination, property)) set_own_key(destination, property, source[property]);
 	return destination;
 }
 /************************************************************
 *  Simulate jansson function
 ************************************************************/
 function json_object_get(o, key) {
-	if (o && o.hasOwnProperty(key)) return o[key];
+	if (o && Object.prototype.hasOwnProperty.call(o, key)) return o[key];
 }
 /************************************************************
 *  Simulate jansson function
 ************************************************************/
 function json_object_del(o, k) {
-	if (o && o.hasOwnProperty(k)) delete o[k];
+	if (o && Object.prototype.hasOwnProperty.call(o, k)) delete o[k];
 }
 /************************************************************
 *  Simulate jansson function
 ************************************************************/
 function json_object_set(o, k, v) {
-	o[k] = v;
+	set_own_key(o, k, v);
 }
 /************************************************************
 *  Simulate jansson function
 ************************************************************/
 function json_object_set_new(o, k, v) {
-	o[k] = v;
+	set_own_key(o, k, v);
 }
 /************************************************************
 *  Simulate jansson function
@@ -3966,22 +3966,20 @@ function kw_pop(kw1, kw2) {
 ************************************************************/
 function kw_has_key(kw, key) {
 	if (key in kw) {
-		if (kw.hasOwnProperty(key)) return true;
+		if (Object.prototype.hasOwnProperty.call(kw, key)) return true;
 	}
 	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
+*  any key the object does not hold 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;
+	return !Object.prototype.hasOwnProperty.call(obj, key);
 }
 function set_own_key(obj, key, value) {
 	if (key === "__proto__") Object.defineProperty(obj, key, {
@@ -4020,6 +4018,13 @@ function kw_find_path(gobj, kw, path, verbose) {
 	let ss = path.split("`");
 	let len = ss.length;
 	for (let i = 0; i < len; i++) {
+		if (is_array(kw)) {
+			if (!/^[0-9]+$/.test(ss[i])) {
+				if (verbose) log_error(`${prefix}path not found: '${path}'`);
+				return;
+			}
+			ss[i] = String(Number(ss[i]));
+		}
 		if (is_prototype_segment(kw, ss[i])) {
 			if (verbose) log_error(`${prefix}path not found: '${path}'`);
 			return;
@@ -4437,7 +4442,7 @@ function kw_set_subdict_value(gobj, kw, path, key, value) {
 		log_error("subdict is not an object");
 		return -1;
 	}
-	subdict[key] = value;
+	set_own_key(subdict, key, value);
 	return 0;
 }
 /***************************************************************************
@@ -4564,14 +4569,14 @@ function kw_clone_by_keys(gobj, kw, keys, verbose) {
 	let kw_clone = {};
 	if (is_string(keys) && !empty_string(keys)) {
 		let key = keys;
-		if (kw.hasOwnProperty(key)) kw_clone[key] = kw[key];
+		if (Object.prototype.hasOwnProperty.call(kw, key)) set_own_key(kw_clone, key, kw[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)) kw_clone[key] = kw[key];
+		for (let key of Object.keys(keys)) if (Object.prototype.hasOwnProperty.call(kw, key)) set_own_key(kw_clone, key, kw[key]);
 		else if (verbose) log_error(`${gobj_short_name(gobj)}: key not found: ${key}`);
 	} else if (is_array(keys) && json_array_size(keys) > 0) for (let j = 0; j < keys.length; j++) {
 		let key = keys[j];
-		if (kw.hasOwnProperty(key)) kw_clone[key] = kw[key];
+		if (Object.prototype.hasOwnProperty.call(kw, key)) set_own_key(kw_clone, key, kw[key]);
 		else if (verbose) log_error(`${gobj_short_name(gobj)}: key not found: ${key}`);
 	}
 	else return kw;
@@ -4593,14 +4598,14 @@ function kw_clone_by_not_keys(gobj, kw, keys, verbose) {
 	json_object_update(kw_clone, kw);
 	if (is_string(keys) && !empty_string(keys)) {
 		let key = keys;
-		if (kw.hasOwnProperty(key)) json_object_del(kw_clone, key);
+		if (Object.prototype.hasOwnProperty.call(kw, 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);
+		for (let key of Object.keys(keys)) if (Object.prototype.hasOwnProperty.call(kw, key)) json_object_del(kw_clone, key);
 		else if (verbose) log_error(`${gobj_short_name(gobj)}: key not found: ${key}`);
 	} else if (is_array(keys) && json_array_size(keys) > 0) for (let j = 0; j < keys.length; j++) {
 		let key = keys[j];
-		if (kw.hasOwnProperty(key)) json_object_del(kw_clone, key);
+		if (Object.prototype.hasOwnProperty.call(kw, key)) json_object_del(kw_clone, key);
 		else if (verbose) log_error(`${gobj_short_name(gobj)}: key not found: ${key}`);
 	}
 	else return {};
@@ -4745,7 +4750,7 @@ function kwid_new_dict(gobj, kw, path) {
 	else if (is_array(kw)) for (let i = 0; i < kw.length; i++) {
 		let kv = kw[i];
 		let id = kw_get_str(gobj, kv, "id", "", kw_flag_t.KW_REQUIRED);
-		if (!empty_string(id)) new_dict[id] = kv;
+		if (!empty_string(id)) set_own_key(new_dict, id, kv);
 	}
 	else log_error(`${gobj_short_name(gobj)} kwid_new_dict: data type unknown`);
 	return new_dict;
@@ -4831,7 +4836,7 @@ function kwid_get_ids(gobj, ids) {
 	let new_ids = [];
 	if (is_string(ids)) new_ids.push(ids);
 	else if (is_object(ids)) {
-		for (let id in ids) if (ids.hasOwnProperty(id)) new_ids.push(id);
+		for (let id in ids) if (Object.prototype.hasOwnProperty.call(ids, id)) new_ids.push(id);
 	} else if (is_array(ids)) ids.forEach(function(item) {
 		if (is_string(item)) {
 			if (!empty_string(item)) new_ids.push(item);
@@ -5084,7 +5089,7 @@ function send_http_json_post(url, data, on_response) {
 function _traverse_dict(obj, callback, full_path) {
 	if (full_path === void 0 || !is_string(full_path)) full_path = "";
 	for (let key of Object.keys(obj)) {
-		if (!obj.hasOwnProperty(key)) continue;
+		if (!Object.prototype.hasOwnProperty.call(obj, key)) continue;
 		let sufix = (full_path.length ? "`" : "") + key;
 		full_path += sufix;
 		callback.apply(this, [
@@ -5191,11 +5196,11 @@ function jdb_update(jdb, topic_name, path, kw) {
 	}
 	if (ids.length === 0 && v) {
 		if (is_array(v)) v.push(kw);
-		else if (v["id"] === kw["id"]) Object.assign(v, kw);
+		else if (v["id"] === kw["id"]) json_object_update(v, kw);
 		else {
 			let v_ = kw_get_dict_value(null, v, jdb.hook, [], 1);
 			let v__ = _jdb_get(v_, jdb.hook, kw["id"], false);
-			if (v__) Object.assign(v__, kw);
+			if (v__) json_object_update(v__, kw);
 			else v_.push(kw);
 		}
 	}
@@ -5562,6 +5567,10 @@ parent: document.body
 *                  as a bare string, or "<img src=x onerror=...>" runs.
 *                  Pass it as a Text node, which is always text:
 *                      ['span', {}, document.createTextNode(value)]
+*                  In a LIST of children a node (element, svg, Text) is
+*                  appended as it is and a string is always text -- but a
+*                  list whose first item is a string is read as ONE
+*                  description (the string is its tag).
 *                  if attrs['i18n'] is not empty then (or 'data-i18n' or 'data_i18next')
 *                          it will be overridden with the translation
 *                          content = translate(attrs['i18n']));
@@ -5614,8 +5623,11 @@ function createElement2(description, translate_fn) {
 	} else if (is_array(content)) {
 		if (content.length > 0) {
 			if (is_string(content[0])) el.appendChild(createElement2(content, translate_fn));
-			else for (let child of content) if (Array.isArray(child) && child.length > 0) el.appendChild(createElement2(child, translate_fn));
-			else if (child instanceof HTMLElement) el.appendChild(child);
+			else for (let child of content) if (Array.isArray(child)) {
+				if (child.length > 0) el.appendChild(createElement2(child, translate_fn));
+			} else if (child instanceof Node) el.appendChild(child);
+			else if (is_string(child)) el.appendChild(document.createTextNode(child));
+			else if (child !== null && child !== void 0 && child !== false) log_error(`createElement2: child ignored, type ${typeof child}`);
 		}
 	} else if (content instanceof HTMLElement || content instanceof Text || content instanceof SVGElement) el.appendChild(content);
 	else if (content != null) {
@@ -5965,7 +5977,7 @@ function json2flat(jn) {
 			return;
 		}
 		if (depth === 0) return;
-		flat[path] = value;
+		set_own_key(flat, path, value);
 	};
 	if (jn === void 0 || jn === null) return flat;
 	walk(jn, "", 0);
@@ -6048,12 +6060,12 @@ function flat_diff(flat1, flat2) {
 		removed: {},
 		changed: {}
 	};
-	for (const key of Object.keys(a)) if (!Object.prototype.hasOwnProperty.call(b, key)) diff.removed[key] = a[key];
-	else if (!flat_value_equal(a[key], b[key])) diff.changed[key] = {
+	for (const key of Object.keys(a)) if (!Object.prototype.hasOwnProperty.call(b, key)) set_own_key(diff.removed, key, a[key]);
+	else if (!flat_value_equal(a[key], b[key])) set_own_key(diff.changed, key, {
 		from: a[key],
 		to: b[key]
-	};
-	for (const key of Object.keys(b)) if (!Object.prototype.hasOwnProperty.call(a, key)) diff.added[key] = b[key];
+	});
+	for (const key of Object.keys(b)) if (!Object.prototype.hasOwnProperty.call(a, key)) set_own_key(diff.added, key, b[key]);
 	return diff;
 }
 /************************************************************
@@ -6067,11 +6079,11 @@ function flat_apply(flat, diff) {
 	if (flat === null || typeof flat !== "object" || Array.isArray(flat)) throw new Error("flat_apply: a flat json is an object of id -> value");
 	if (diff === null || typeof diff !== "object") throw new Error("flat_apply: a diff is the object flat_diff() answers");
 	for (const key of Object.keys(diff.removed || {})) delete flat[key];
-	for (const key of Object.keys(diff.added || {})) flat[key] = diff.added[key];
+	for (const key of Object.keys(diff.added || {})) set_own_key(flat, key, diff.added[key]);
 	for (const key of Object.keys(diff.changed || {})) {
 		const change = diff.changed[key];
 		if (!change || !Object.prototype.hasOwnProperty.call(change, "to")) throw new Error(`flat_apply: changed '${key}' without a 'to'`);
-		flat[key] = change.to;
+		set_own_key(flat, key, change.to);
 	}
 	return flat;
 }
@@ -7161,7 +7173,7 @@ function mt_inject_event(gobj, event, kw, src) {
 		window.console.error(`Not in session`);
 		return -1;
 	}
-	kw = Object.assign({}, is_object(kw) ? kw : {});
+	kw = json_object_update({}, is_object(kw) ? kw : {});
 	if (is_object(kw["__md_iev__"])) kw["__md_iev__"] = json_deep_copy(kw["__md_iev__"]);
 	if (msg_iev_get_stack(gobj, kw, IEVENT_STACK_ID)) {} else {
 		let jn_ievent_id = build_cli_ievent_request(gobj, gobj_name(src), kw_get_str(gobj, kw, "__service__", 0, 0));
@@ -7213,18 +7225,25 @@ function setup_websocket(gobj) {
 	if (gobj.priv.websocket) log_error(`Websocket ALREADY setup`);
 	const url = gobj_read_str_attr(gobj, "url");
 	log_debug(`====> Starting WebSocket to '${url}' (${gobj_short_name(gobj)})`);
+	const ws_seq = ++gobj.priv.ws_seq;
 	let websocket;
 	try {
 		websocket = new WebSocket(url);
 	} catch (e) {
 		log_error(`${gobj_short_name(gobj)}: Cannot open WebSocket to '${url}', Error: ${e.message}`);
+		gobj_post_event(gobj, "EV_ON_CLOSE", {
+			url,
+			ws_seq,
+			code: 1006,
+			reason: e.message,
+			was_clean: false
+		}, gobj);
 		return null;
 	}
 	if (!websocket) {
 		log_error(`${gobj_short_name(gobj)}: Failed to initialize WebSocket.`);
 		return null;
 	}
-	const ws_seq = ++gobj.priv.ws_seq;
 	websocket.onopen = () => {
 		if (ws_seq !== gobj.priv.ws_seq || gobj_is_destroying(gobj)) return;
 		gobj_send_event(gobj, "EV_ON_OPEN", {
@@ -7477,6 +7496,7 @@ function ac_on_open(gobj, event, kw, src) {
 function ac_on_close(gobj, event, kw, src) {
 	let priv = gobj.priv;
 	let url = kw.url;
+	if (kw.ws_seq !== void 0 && kw.ws_seq !== priv.ws_seq) return 0;
 	set_remote_log_functions();
 	log_warning(`${gobj_short_name(gobj)}: WebSocket closed ${url} (Code: ${kw.code}, Reason: "${kw.reason}", Clean: ${kw.was_clean})`);
 	if (priv.websocket) {
@@ -7494,7 +7514,7 @@ function ac_on_close(gobj, event, kw, src) {
 			remote_yuno_role: priv.remote_yuno_role,
 			remote_yuno_service: priv.remote_yuno_service
 		});
-	} else {
+	} else if (!gobj_is_running(gobj)) {} else {
 		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,