@yuneta/gobj-js 7.26.3 → 7.26.5

package/dist/gobj-js.cjs.js

@@ -4004,6 +4004,12 @@ function set_own_key(obj, key, value) {
 *  called gobj_short_name() on a null gobj ("gobj bad type"), and a
 *  null middle segment threw a TypeError.
 ************************************************************/
+function list_segment_index(list, seg) {
+	if (!/^[0-9]+$/.test(seg)) return -1;
+	const idx = Number(seg);
+	if (idx >= list.length) return -1;
+	return idx;
+}
 function kw_find_path(gobj, kw, path, verbose) {
 	if (gobj && !is_gobj(gobj)) log_error(`GObj bad instanceof`);
 	const prefix = gobj ? `${gobj_short_name(gobj)}: ` : "";
@@ -4019,11 +4025,12 @@ function kw_find_path(gobj, kw, path, verbose) {
 	let len = ss.length;
 	for (let i = 0; i < len; i++) {
 		if (is_array(kw)) {
-			if (!/^[0-9]+$/.test(ss[i])) {
+			const idx = list_segment_index(kw, ss[i]);
+			if (idx < 0) {
 				if (verbose) log_error(`${prefix}path not found: '${path}'`);
 				return;
 			}
-			ss[i] = String(Number(ss[i]));
+			ss[i] = String(idx);
 		}
 		if (is_prototype_segment(kw, ss[i])) {
 			if (verbose) log_error(`${prefix}path not found: '${path}'`);
@@ -4058,8 +4065,14 @@ function strrchr_split(str, char) {
 function kw_delete(gobj, kw, path) {
 	if (gobj && !is_gobj(gobj)) log_error(`GObj bad instanceof`);
 	let [path_, k] = strrchr_split(path, "`");
-	if (!empty_string(k)) json_object_del(kw_find_path(gobj, kw, path_, true), k);
-	else json_object_del(kw, path);
+	if (!empty_string(k)) {
+		let v = kw_find_path(gobj, kw, path_, true);
+		if (is_array(v)) {
+			log_error(`${gobj ? gobj_short_name(gobj) + ": " : ""}kw_delete(): cannot delete an item of a list: '${path}'`);
+			return -1;
+		}
+		json_object_del(v, k);
+	} else json_object_del(kw, path);
 	return 0;
 }
 /************************************************************
@@ -4415,6 +4428,14 @@ function kw_set_dict_value(gobj, kw, path, value) {
 	let len = ss.length;
 	for (let i = 0; i < len; i++) {
 		let key = ss[i];
+		if (is_array(kw)) {
+			const idx = list_segment_index(kw, key);
+			if (idx < 0) {
+				log_error(`${gobj ? gobj_short_name(gobj) + ": " : ""}kw_set_dict_value(): segment '${key}' is not an index of its list: '${path}'`);
+				return -1;
+			}
+			key = String(idx);
+		}
 		if (i === len - 1) set_own_key(kw, key, value);
 		else {
 			let seg = is_prototype_segment(kw, key) ? void 0 : kw[key];
@@ -6579,7 +6600,7 @@ function create_template_record(template, kw) {
 		let default_value;
 		if (is_object(col)) default_value = col.default;
 		let value = kw_get_dict_value(null, kw, field, default_value);
-		new_record[field] = value;
+		json_object_set(new_record, field, value);
 	});
 	return new_record;
 }
@@ -7301,13 +7322,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", {
+		if (gobj_post_event(gobj, "EV_ON_CLOSE", {
 			url,
 			ws_seq,
 			code: 1006,
 			reason: e.message,
 			was_clean: false
-		}, gobj);
+		}, gobj) < 0) set_timeout(gobj.priv.gobj_timer, next_retry(gobj));
 		return null;
 	}
 	if (!websocket) {