@yuneta/gobj-js 7.7.1 → 7.7.3

package/dist/gobj-js.cjs.js

@@ -3622,7 +3622,7 @@ function kwid_new_dict(gobj, kw, path) {
 	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`);
@@ -4913,6 +4913,7 @@ function treedb_decoder_hook(col, hook) {
 *          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,
@@ -4982,7 +4983,8 @@ function treedb_get_field_desc(col) {
 		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++) {
@@ -5028,7 +5030,8 @@ function template_get_field_desc(key, value) {
 		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(".");
@@ -5072,7 +5075,9 @@ function create_template_record(template, kw) {
 	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;
 }
@@ -5589,7 +5594,7 @@ function mt_inject_event(gobj, event, kw, src) {
 ***************************************************************/
 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);
 }
@@ -5598,7 +5603,7 @@ function mt_subscription_added(gobj, subs) {
 ***************************************************************/
 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 = {};
@@ -5719,6 +5724,10 @@ function send_iev(gobj, iev) {
 			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) {