@yuneta/gobj-js 7.26.1 → 7.26.2

package/dist/gobj-js.es.js

@@ -907,7 +907,7 @@ function json2item(gobj, sdata, it, 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);
 	}
@@ -2110,7 +2110,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;
@@ -2216,9 +2216,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);
 				}
@@ -2239,9 +2239,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);
 				}
@@ -2268,7 +2268,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);
 		}
 	}
@@ -2302,7 +2302,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);
 		}
@@ -2318,7 +2318,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);
 		}
@@ -2334,7 +2334,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);
 		}
@@ -2722,8 +2722,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__;
@@ -2731,7 +2731,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__;
@@ -3107,7 +3107,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__));
@@ -3644,10 +3644,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;
 }
 /************************************************************
@@ -4020,6 +4017,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 +4441,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;
 }
 /***************************************************************************
@@ -4745,7 +4749,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;
@@ -5191,11 +5195,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 +5566,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 +5622,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) {
@@ -6048,12 +6059,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;
 }
 /************************************************************
@@ -7161,7 +7172,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));
@@ -7219,6 +7230,13 @@ function setup_websocket(gobj) {
 		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) {
@@ -7477,6 +7495,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 +7513,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,