@yuneta/gobj-js 7.3.4 → 7.6.6

package/dist/gobj-js.umd.js

@@ -1766,8 +1766,12 @@
 			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;
@@ -1998,9 +2002,9 @@
 	*
 	***************************************************************************/
 	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;
 	}
@@ -5480,7 +5484,13 @@
 		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;
 	}
 	/***************************************************************