@yuneta/gobj-js 7.26.0 → 7.26.1

package/dist/gobj-js.umd.js

@@ -898,10 +898,13 @@
 				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_;
@@ -2602,7 +2605,7 @@
 		} 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) {}
@@ -3610,7 +3613,7 @@
 				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;
 		}
@@ -3682,7 +3685,7 @@
 	************************************************************/
 	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;
 	}
 	/************************************************************
@@ -3691,7 +3694,7 @@
 	************************************************************/
 	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;
 	}
 	/************************************************************
@@ -3700,32 +3703,32 @@
 	************************************************************/
 	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
@@ -3969,22 +3972,20 @@
 	************************************************************/
 	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, {
@@ -4567,14 +4568,14 @@
 		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;
@@ -4596,14 +4597,14 @@
 		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 {};
@@ -4834,7 +4835,7 @@
 		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);
@@ -5087,7 +5088,7 @@
 	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, [
@@ -5968,7 +5969,7 @@
 				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);
@@ -6070,11 +6071,11 @@
 		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;
 	}
@@ -7216,6 +7217,7 @@
 		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);
@@ -7227,7 +7229,6 @@
 			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", {