@yuneta/gobj-js 7.7.1 → 7.7.3

package/dist/gobj-js.umd.js

@@ -3625,7 +3625,7 @@
 		if (is_object(kw)) new_dict = kw;
 		else if (is_array(kw)) for (let i = 0; i < kw.length; i++) {
 			let kv = kw[i];
-			let id = kw_get_str(kv, "id", null, false);
+			let id = kw_get_str(gobj, kv, "id", "", 0);
 			if (!empty_string(id)) new_dict[id] = kv;
 		}
 		else log_error(`${gobj_short_name(gobj)} kwid_new_dict: data type unknown`);
@@ -4916,6 +4916,7 @@
 	*          is_writable     // field writable (no readonly)
 	*          default_value
 	*          placeholder
+	*          fkey            // fkey mapping {topic_name: hook_name}, null if none
 	*      ]
 	*
 	*  The template is recursive, in values you can set dictionaries, or arrays,
@@ -4985,7 +4986,8 @@
 			is_hidden: false,
 			default_value: col.default,
 			placeholder: col.placeholder,
-			fillspace: col.fillspace || 4
+			fillspace: col.fillspace || 4,
+			fkey: col.fkey || null
 		};
 		if (!col.flag) return field_desc;
 		for (let i = 0; i < col.flag.length; i++) {
@@ -5031,7 +5033,8 @@
 			is_writable: false,
 			is_hidden: false,
 			default_value: void 0,
-			placeholder: void 0
+			placeholder: void 0,
+			fkey: null
 		};
 		if (is_string(value)) {
 			let values = value.split(".");
@@ -5075,7 +5078,9 @@
 		let new_record = {};
 		if (!kw) kw = {};
 		Object.entries(template).forEach(([field, col]) => {
-			new_record[field] = kw_get_dict_value(null, kw, field, kw_get_dict_value(col, "default"));
+			let default_value;
+			if (is_object(col)) default_value = col.default;
+			new_record[field] = kw_get_dict_value(null, kw, field, default_value);
 		});
 		return new_record;
 	}
@@ -5592,7 +5597,7 @@
 	***************************************************************/
 	function mt_subscription_added(gobj, subs) {
 		let priv = gobj.priv;
-		if (gobj_current_state(gobj) !== "ST_SESSION") return 0;
+		if (gobj_current_state(gobj) !== "ST_SESSION" || !priv.websocket) return 0;
 		if (priv.inside_on_open) return 0;
 		return send_remote_subscription(gobj, subs);
 	}
@@ -5601,7 +5606,7 @@
 	***************************************************************/
 	function mt_subscription_deleted(gobj, subs) {
 		let priv = gobj.priv;
-		if (gobj_current_state(gobj) !== "ST_SESSION") return 0;
+		if (gobj_current_state(gobj) !== "ST_SESSION" || !priv.websocket) return 0;
 		if (priv.inside_on_open) return 0;
 		if (empty_string(subs.event)) return 0;
 		let kw = {};
@@ -5722,6 +5727,10 @@
 				trace_ievent_callback(prefix, iev, 1, size);
 			} else trace_inter_event(gobj, prefix, iev);
 		}
+		if (!priv.websocket || priv.websocket.readyState !== WebSocket.OPEN) {
+			log_warning(`${gobj_short_name(gobj)}: send_iev(): websocket not open, message lost`);
+			return -1;
+		}
 		try {
 			priv.websocket.send(msg);
 		} catch (e) {