@yuneta/gobj-js 7.3.4 → 7.6.6

package/dist/gobj-js.es.js

@@ -1762,8 +1762,12 @@ function gobj_read_attrs(gobj, include_flag, src) {
 		const it = sdata_desc[i];
 		if (!it.name) continue;
 		if (include_flag === -1 || it.flag & include_flag) {
-			let jn = json_object_get(gobj.jn_attrs, it.name);
-			json_object_set(jn_attrs, it.name, jn);
+			let value;
+			if (gobj.gclass.gmt.mt_reading && !(gobj.obflag & obflag_t.obflag_destroyed)) {
+				value = gobj.gclass.gmt.mt_reading(gobj, it.name);
+				if (value === void 0) value = json_object_get(gobj.jn_attrs, it.name);
+			} else value = json_object_get(gobj.jn_attrs, it.name);
+			json_object_set(jn_attrs, it.name, value);
 		}
 	}
 	return jn_attrs;
@@ -1994,9 +1998,9 @@ function gobj_change_state(gobj, state_name) {
 *
 ***************************************************************************/
 function gobj_current_state(gobj) {
-	if (gobj_is_destroying(gobj)) {
-		log_error("gobj NULL or DESTROYED");
-		return null;
+	if (!is_gobj(gobj)) {
+		log_error("hgobj NULL");
+		return "";
 	}
 	return gobj.current_state.state_name;
 }
@@ -5476,7 +5480,13 @@ function mt_stop(gobj) {
 	let priv = gobj.priv;
 	clear_timeout(priv.gobj_timer);
 	gobj_stop(priv.gobj_timer);
-	if (priv.websocket) close_websocket(gobj);
+	if (priv.websocket) {
+		priv.websocket.onopen = null;
+		priv.websocket.onmessage = null;
+		priv.websocket.onerror = null;
+		priv.websocket.onclose = null;
+		close_websocket(gobj);
+	}
 	return 0;
 }
 /***************************************************************