@yuneta/gobj-js 7.26.3 → 7.26.5

package/dist/gobj-js.umd.js

@@ -4007,6 +4007,12 @@
 	*  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)}: ` : "";
@@ -4022,11 +4028,12 @@
 		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}'`);
@@ -4061,8 +4068,14 @@
 	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;
 	}
 	/************************************************************
@@ -4418,6 +4431,14 @@
 		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];
@@ -6582,7 +6603,7 @@
 			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;
 	}
@@ -7304,13 +7325,13 @@
 			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) {