@yuneta/gobj-js 7.13.3 → 7.13.5

package/dist/gobj-js.cjs.js

@@ -1580,7 +1580,7 @@ function gobj_play(gobj) {
 	let ret = 0;
 	if (gobj.gclass.gmt.mt_play) {
 		ret = gobj.gclass.gmt.mt_play(gobj);
-		if (ret < 0) gobj.playing = false;
+		if (ret < 0 || ret === false) gobj.playing = false;
 	}
 	return ret;
 }
@@ -1802,17 +1802,39 @@ function gobj_walk_gobj_children_tree(gobj, walk_type, cb_walking, user_data, us
 /***************************************************************
 *  Walking
 ***************************************************************/
+/***************************************************************
+*  What a WALK CALLBACK answered, as the number the contract is
+*  written in: -1 stop the walk, 0 descend into the children,
+*  >0 do not descend.
+*
+*  A javascript callback that simply RETURNS NOTHING is the common
+*  case, and `undefined` is neither `< 0` nor `=== 0`, so the walk
+*  used to read it as "do not descend" and skipped the subtree in
+*  silence. Nothing is 0 here — the neutral answer, the one C gives
+*  when an action has nothing to say.
+*
+*  A boolean is NOT guessed: `true`/`false` could mean either half of
+*  this contract, so it is reported and taken as 0. A walk that
+*  silently loses a subtree is the thing this whole function exists
+*  to stop.
+***************************************************************/
+function walk_ret(ret) {
+	if (typeof ret === "number" && isFinite(ret)) return ret;
+	if (ret === void 0 || ret === null) return 0;
+	log_error(`walk callback must return a NUMBER (-1 stop, 0 descend, >0 skip children), got ${typeof ret}: taken as 0`);
+	return 0;
+}
 function rc_walk_by_list(iter_, walk_type, cb_walking, user_data, user_data2) {
 	let iter = [...iter_];
 	let child;
 	if (walk_type & walk_type_t.WALK_LAST2FIRST) for (let i = iter.length; i > 0; i--) {
 		child = iter[i - 1];
-		let ret = cb_walking(child, user_data, user_data2);
+		let ret = walk_ret(cb_walking(child, user_data, user_data2));
 		if (ret < 0) return ret;
 	}
 	else for (let i = 0; i < iter.length; i++) {
 		child = iter[i];
-		let ret = cb_walking(child, user_data, user_data2);
+		let ret = walk_ret(cb_walking(child, user_data, user_data2));
 		if (ret < 0) return ret;
 	}
 	return 0;
@@ -1865,12 +1887,12 @@ function rc_walk_by_tree(iter, walk_type, cb_walking, user_data, user_data2) {
 		child = iter[i - 1];
 		ret = rc_walk_by_tree([...child.dl_children], walk_type, cb_walking, user_data, user_data2);
 		if (ret < 0) return ret;
-		ret = cb_walking(child, user_data, user_data2);
+		ret = walk_ret(cb_walking(child, user_data, user_data2));
 		if (ret < 0) return ret;
 	}
 	else for (let i = 0; i < iter.length; i++) {
 		child = iter[i];
-		ret = cb_walking(child, user_data, user_data2);
+		ret = walk_ret(cb_walking(child, user_data, user_data2));
 		if (ret < 0) return ret;
 		else if (ret === 0) {
 			ret = rc_walk_by_tree([...child.dl_children], walk_type, cb_walking, user_data, user_data2);
@@ -2714,7 +2736,8 @@ function gobj_subscribe_event(publisher, event, kw, subscriber) {
 		if (kw) trace_json(kw);
 	}
 	if (publisher.gclass.gmt.mt_subscription_added) {
-		if (publisher.gclass.gmt.mt_subscription_added(publisher, subs) < 0) {
+		let result = publisher.gclass.gmt.mt_subscription_added(publisher, subs);
+		if (result < 0 || result === false) {
 			_delete_subscription(publisher, subs, true, true);
 			subs = 0;
 		}
@@ -2863,7 +2886,7 @@ function gobj_publish_event(publisher, event, kw) {
 		if (publisher.gclass.gmt.mt_publication_pre_filter) {
 			let topublish = publisher.gclass.gmt.mt_publication_pre_filter(publisher, subs, event, kw);
 			if (topublish < 0) break;
-			else if (topublish === 0) continue;
+			else if (!topublish) continue;
 		}
 		let subscriber = kw_get_pointer(publisher, subs, "subscriber", null, kw_flag_t.KW_REQUIRED);
 		if (!(subscriber && !gobj_is_destroying(subscriber))) continue;
@@ -6434,7 +6457,7 @@ function ac_on_message(gobj, event, kw, src) {
 	let iev_kw = iev_msg.kw;
 	if (gobj_current_state(gobj) !== "ST_SESSION") {
 		if (gobj_has_event(gobj, iev_event, event_flag_t.EVF_PUBLIC_EVENT)) {
-			if (gobj_send_event(gobj, iev_event, iev_kw, gobj) === 0) return 0;
+			if (!(gobj_send_event(gobj, iev_event, iev_kw, gobj) < 0)) return 0;
 		} else log_error(`${gobj_short_name(gobj)}: event UNKNOWN in not-session state ${iev_event}`);
 		close_websocket(gobj);
 		return -1;
@@ -6861,5 +6884,6 @@ exports.treedb_encoder_fkey = treedb_encoder_fkey;
 exports.treedb_get_field_desc = treedb_get_field_desc;
 exports.treedb_hook_data_size = treedb_hook_data_size;
 exports.vsprintf = vsprintf;
+exports.walk_type_t = walk_type_t;
 
 //# sourceMappingURL=gobj-js.cjs.js.map