@yuneta/gobj-js 7.26.22 → 7.26.24

package/dist/gobj-js.umd.js

@@ -869,6 +869,75 @@
 	var INT64_MIN = -(2n ** 63n);
 	var INT64_MAX = 2n ** 63n - 1n;
 	var REFUSED_TEXT = "a text that does not read as one";
+	var JSON_NUMBER_TOKEN = /-?(0|[1-9][0-9]*)(\.[0-9]+)?([eE][+-]?[0-9]+)?/y;
+	function is_surrogate_pair(high, low) {
+		return high >= 55296 && high <= 56319 && low >= 56320 && low <= 57343;
+	}
+	function json_text_refused_by_c(s) {
+		const n = s.length;
+		let i = 0;
+		while (i < n) {
+			const c = s.charCodeAt(i);
+			if (c === 34) {
+				i++;
+				while (i < n) {
+					const d = s.charCodeAt(i);
+					if (d === 34) {
+						i++;
+						break;
+					}
+					if (d === 92 && s[i + 1] === "u") {
+						const u = parseInt(s.substring(i + 2, i + 6), 16);
+						if (u === 0) return true;
+						if (u >= 55296 && u <= 57343) {
+							if (!is_surrogate_pair(u, s[i + 6] === "\\" && s[i + 7] === "u" ? parseInt(s.substring(i + 8, i + 12), 16) : -1)) return true;
+							i += 12;
+							continue;
+						}
+						i += 6;
+						continue;
+					}
+					if (d === 92) {
+						i += 2;
+						continue;
+					}
+					if (d >= 55296 && d <= 57343) {
+						if (!is_surrogate_pair(d, s.charCodeAt(i + 1))) return true;
+						i += 2;
+						continue;
+					}
+					i++;
+				}
+				continue;
+			}
+			if (c === 45 || c >= 48 && c <= 57) {
+				JSON_NUMBER_TOKEN.lastIndex = i;
+				const m = JSON_NUMBER_TOKEN.exec(s);
+				if (!m) return true;
+				const token = m[0];
+				if (/[.eE]/.test(token)) {
+					if (!Number.isFinite(Number(token))) return true;
+				} else {
+					const big = BigInt(token);
+					if (big < INT64_MIN || big > INT64_MAX) return true;
+				}
+				i += token.length;
+				continue;
+			}
+			i++;
+		}
+		return false;
+	}
+	function parse_json_text_as_c(s) {
+		let jn;
+		try {
+			jn = JSON.parse(s);
+		} catch (e) {
+			return;
+		}
+		if (json_text_refused_by_c(s)) return;
+		return jn;
+	}
 	function value_has_shape(type, value) {
 		if (DTP_IS_STRING(type)) return is_string(value);
 		if (DTP_IS_DICT(type)) return is_object(value);
@@ -972,16 +1041,8 @@
 			};
 		}
 		if (DTP_IS_DICT(type) || DTP_IS_LIST(type)) {
-			let jn;
-			try {
-				jn = JSON.parse(s);
-			} catch (e) {
-				return {
-					value: void 0,
-					refused: REFUSED_TEXT
-				};
-			}
-			if (!value_has_shape(type, jn)) return {
+			const jn = parse_json_text_as_c(s);
+			if (jn === void 0 || !value_has_shape(type, jn)) return {
 				value: void 0,
 				refused: REFUSED_TEXT
 			};
@@ -990,12 +1051,12 @@
 				refused: null
 			};
 		}
-		if (DTP_IS_JSON(type)) try {
-			return {
-				value: JSON.parse(s),
+		if (DTP_IS_JSON(type)) {
+			const jn = parse_json_text_as_c(s);
+			if (jn !== void 0) return {
+				value: jn,
 				refused: null
 			};
-		} catch (e) {
 			const t = s.replace(/^[ \t]+/, "");
 			if (t.startsWith("{") || t.startsWith("[") || t.startsWith("\"")) return {
 				value: void 0,
@@ -1088,8 +1149,18 @@
 		data_type_t.DTP_LIST,
 		data_type_t.DTP_DICT
 	];
+	var NO_JSON_TEXT = "a value with no json text";
+	function json_text_of(value) {
+		try {
+			const s = JSON.stringify(value);
+			return is_string(s) ? s : void 0;
+		} catch (e) {
+			return;
+		}
+	}
 	function log_attr_value_refused(gobj, it, value, refused) {
 		const types = {
+			[data_type_t.DTP_STRING]: "a string",
 			[data_type_t.DTP_BOOLEAN]: "a boolean",
 			[data_type_t.DTP_INTEGER]: "an integer",
 			[data_type_t.DTP_REAL]: "a real",
@@ -1099,7 +1170,8 @@
 		let shown;
 		if (it.flag & sdata_flag_t.SDF_SECRET) shown = "********";
 		else {
-			shown = is_string(value) ? value : String(JSON.stringify(value === void 0 ? null : value));
+			shown = is_string(value) ? value : json_text_of(value === void 0 ? null : value);
+			if (shown === void 0) shown = `<${NO_JSON_TEXT}>`;
 			const masked = mask_secrets_inline(shown);
 			if (masked !== null) shown = masked;
 			if (shown.length > ATTR_VALUE_SHOWN) {
@@ -1121,8 +1193,11 @@
 				if (jn_value_ === null || jn_value_ === void 0) jn_value2 = "";
 				else if (is_string(jn_value_)) jn_value2 = String(jn_value_);
 				else {
-					let s = JSON.stringify(jn_value_);
-					if (s) jn_value2 = String(s);
+					jn_value2 = json_text_of(jn_value_);
+					if (jn_value2 === void 0) {
+						log_attr_value_refused(gobj, it, jn_value_, NO_JSON_TEXT);
+						return -1;
+					}
 				}
 				break;
 			case data_type_t.DTP_BOOLEAN:
@@ -2570,15 +2645,20 @@
 	*  The value a typed writer writes, read as ITS type by the grammar of
 	*  json2item() (a C writer takes its C type: a string is never read as a
 	*  number there). Return {value} or {refused} (logged): the attr keeps its
-	*  value. A string writer never refuses: null and undefined are "", any
-	*  other json its text, as a DTP_STRING attr reads them.
+	*  value. A string writer takes null and undefined as "", any other json
+	*  as its text, as a DTP_STRING attr reads them; it refuses only a value
+	*  with no json text (circular, a BigInt).
 	***************************************************************************/
 	function typed_writer_value(gobj, name, type, value) {
+		let r;
 		if (DTP_IS_STRING(type)) {
 			if (value === null || value === void 0) return { value: "" };
-			return { value: is_string(value) ? value : String(JSON.stringify(value)) };
-		}
-		const r = command_parameter_from_json(type, value);
+			if (is_string(value)) return { value };
+			r = {
+				value: json_text_of(value),
+				refused: NO_JSON_TEXT
+			};
+		} else r = command_parameter_from_json(type, value);
 		if (r.value === void 0) {
 			let holder = gobj;
 			while (holder && !gobj_has_attr(holder, name)) holder = holder.bottom_gobj;
@@ -3023,9 +3103,9 @@
 			}
 		}
 		const frame = push_dispatch_frame(dst, event, frame_kind_t.FRAME_ACTION);
-		if (event_action.next_state) gobj_change_state(dst, event_action.next_state);
 		let ret = -1;
 		try {
+			if (event_action.next_state) gobj_change_state(dst, event_action.next_state);
 			if (event_action.action) ret = event_action.action(dst, event, kw, src);
 		} catch (e) {
 			__inside__--;
@@ -3049,18 +3129,23 @@
 		__own_event__: 4
 	});
 	/***************************************************************************
-	*  The event type of `event_name` in any registered gclass, null if none.
-	*  The C kernel's gobj_find_event_type(): any case, gclasses only.
+	*  The event type of `event_name` in any registered gclass whose flags
+	*  hold one of `event_flag` (0: any), null if none. The C kernel's
+	*  gobj_find_event_type(): any case, gclasses only. With `verbose` a miss
+	*  is logged, with the name as it was given: never verbose for a name
+	*  that came from a peer.
 	***************************************************************************/
-	function _find_event_type_in_gclasses(event_name) {
+	function gobj_find_event_type(event_name, event_flag, verbose) {
 		let lower = String(event_name).toLowerCase();
 		for (let gclass_name in _gclass_register) {
 			let dl = _gclass_register[gclass_name].dl_events;
 			for (let i = 0; i < dl.length; i++) {
 				let event_type = dl[i];
+				if (event_flag && !(event_type.event_flag & event_flag)) continue;
 				if (event_type.event_name && event_type.event_name.toLowerCase() === lower) return event_type;
 			}
 		}
+		if (verbose) log_error(`EVENT NOT FOUND: ${event_name}`);
 		return null;
 	}
 	var subscription_desc = [
@@ -3097,7 +3182,7 @@
 				json_object_set_new(subs, "__config__", kw_clone);
 				let renamed_event = kw_get_str(publisher, kw_clone, "__rename_event_name__", "");
 				if (!empty_string(renamed_event)) {
-					let event_type = _find_event_type_in_gclasses(renamed_event);
+					let event_type = gobj_find_event_type(renamed_event, 0, false);
 					if (event_type) {
 						json_object_set_new(subs, "renamed_event", event_type.event_name);
 						delete kw_clone.__rename_event_name__;
@@ -3158,7 +3243,7 @@
 		kw_match.__config__ = config_match;
 		let renamed_event = "";
 		let rename = config_match.__rename_event_name__;
-		let event_type = typeof rename === "string" && !empty_string(rename) ? _find_event_type_in_gclasses(rename) : null;
+		let event_type = typeof rename === "string" && !empty_string(rename) ? gobj_find_event_type(rename, 0, false) : null;
 		if (event_type) {
 			renamed_event = event_type.event_name;
 			delete config_match.__rename_event_name__;
@@ -4322,12 +4407,13 @@
 			const name_from = word;
 			word = p + 1;
 			const secret = is_secret_name_tail(str, name_from, p, names);
-			if (secret && names === NAMES_NOW && !is_secret_name_tail(str, name_from, p, NAMES_7_26_9)) not_7_26_9 = true;
+			if (secret && names === NAMES_NOW && !not_7_26_9 && !is_secret_name_tail(str, name_from, p, NAMES_7_26_9)) not_7_26_9 = true;
 			if (!(secret || value_is_secret && p - name_from === 5 && ascii_case_equal(str, name_from, "value"))) {
-				if (judged && query_name_from(str, p) === name_from) judged[p] = 1;
+				if (judged && query_name_from(str, p) === name_from) judged[p] = JUDGED_NOT_SECRET;
 				p++;
 				continue;
 			}
+			if (judged && secret && query_name_from(str, p) === name_from) judged[p] = JUDGED_SECRET;
 			p++;
 			let end;
 			const quote = p < str.length && (str[p] === "\"" || str[p] === "'") ? str[p] : "";
@@ -4390,23 +4476,99 @@
 		while (n > 0 && eq - n < MASK_MAX_NAME && is_name_char_code(str.charCodeAt(n - 1))) n--;
 		return n;
 	}
+	var JUDGED_NOT_SECRET = 1;
+	var JUDGED_SECRET = 2;
+	function hex_digit_value(code) {
+		if (code >= 48 && code <= 57) return code - 48;
+		if (code >= 97 && code <= 102) return code - 87;
+		if (code >= 65 && code <= 70) return code - 55;
+		return -1;
+	}
+	function is_written_name_bracket_code(code) {
+		return code === 91 || code === 93 || code === 39 || code === 34;
+	}
+	function is_written_name_code(code) {
+		return is_name_char_code(code) || code === 37 || is_written_name_bracket_code(code);
+	}
+	function written_name_is_secret(str, eq) {
+		let n = eq;
+		let plain = -1;
+		while (n > 0 && eq - n < MASK_MAX_NAME && is_written_name_code(str.charCodeAt(n - 1))) {
+			n--;
+			if (plain < 0 && !is_name_char_code(str.charCodeAt(n))) plain = n + 1;
+		}
+		if (plain < 0) return false;
+		const to = str.charCodeAt(plain - 1) === 37 ? eq : plain - 1;
+		let encoded = false;
+		for (let s = n; s < to && !encoded; s++) encoded = str.charCodeAt(s) === 37;
+		let name = str;
+		let from = n;
+		let end = to;
+		if (encoded) {
+			name = "";
+			for (let s = n; s < to; s++) {
+				const hi = str.charCodeAt(s) === 37 && to - s > 2 ? hex_digit_value(str.charCodeAt(s + 1)) : -1;
+				const lo = hi >= 0 ? hex_digit_value(str.charCodeAt(s + 2)) : -1;
+				if (lo >= 0) {
+					name += String.fromCharCode(hi * 16 + lo);
+					s += 2;
+				} else name += str[s];
+			}
+			from = 0;
+			end = name.length;
+		}
+		let seg = from;
+		for (let i = from; i <= end; i++) {
+			if (i < end && !is_written_name_bracket_code(name.charCodeAt(i))) continue;
+			if (i - seg >= 3 && secret_name_check(name, seg, i, true, true)) return true;
+			seg = i + 1;
+		}
+		return false;
+	}
+	function mark_query_value(str, eq, marks) {
+		const v = eq + 1;
+		if (v < str.length && (str[v] === "\"" || str[v] === "'")) return mark_run(str, v + 1, QUOTE_STOPS[str[v]], marks);
+		mark_scheme_value(str, v, PARAM_VALUE_STOPS, marks);
+		return mark_run(str, v, PARAM_VALUE_STOPS, marks);
+	}
+	var WRITTEN_NAME_MARKS = /[[\]%'"]/;
 	function mark_query_params(str, marks, judged) {
 		let frontier = 0;
-		for (let p = 1; p < str.length; p++) {
-			if (p < frontier) {
-				p = frontier - 1;
-				continue;
-			}
-			if (str.charCodeAt(p) !== 61) continue;
-			if (judged[p]) continue;
-			const n = query_name_from(str, p);
-			if (n === p || !secret_name_check(str, n, p, true, true)) continue;
-			const v = p + 1;
-			if (v < str.length && (str[v] === "\"" || str[v] === "'")) frontier = mark_run(str, v + 1, QUOTE_STOPS[str[v]], marks);
-			else {
-				mark_scheme_value(str, v, PARAM_VALUE_STOPS, marks);
-				frontier = mark_run(str, v, PARAM_VALUE_STOPS, marks);
+		let frontier_written = WRITTEN_NAME_MARKS.test(str) ? 0 : str.length;
+		let p = str.indexOf("=", 1);
+		while (p > 0) {
+			if (p >= frontier) {
+				let secret = judged[p] === JUDGED_SECRET;
+				if (!judged[p]) {
+					const n = query_name_from(str, p);
+					secret = n < p && secret_name_check(str, n, p, true, true);
+				}
+				if (secret) frontier = mark_query_value(str, p, marks);
+			}
+			if (p >= frontier_written && written_name_is_secret(str, p)) frontier_written = mark_query_value(str, p, marks);
+			p = str.indexOf("=", p + 1);
+		}
+	}
+	var URL_AUTHORITY_STOPS = stop_table("/?#\"'<> 	");
+	function mark_url_passwords(str, marks) {
+		let p = str.indexOf("://", 1);
+		while (p > 0) {
+			let next = p + 1;
+			if (is_ascii_alnum_code(str.charCodeAt(p - 1))) {
+				let colon = -1;
+				let at = -1;
+				let e = p + 3;
+				while (e < str.length) {
+					const code = str.charCodeAt(e);
+					if (code < 128 && URL_AUTHORITY_STOPS[code]) break;
+					if (code === 64) at = e;
+					else if (code === 58 && colon < 0) colon = e;
+					e++;
+				}
+				if (colon >= 0 && at > colon) mark_range(marks, colon + 1, at);
+				next = e - 1;
 			}
+			p = str.indexOf("://", next);
 		}
 	}
 	function mark_shapes(str, marks) {
@@ -4467,6 +4629,7 @@
 		if (mark_params(str, value_is_secret, READ_NOW, marks, judged) || value_is_secret !== value_is_secret_7_26_9) mark_params(str, value_is_secret_7_26_9, READ_AS_7_26_9, marks, null);
 		if (has_shape_js_7_26_20(str)) mark_params(str, value_is_secret, READ_AS_GOBJ_JS_7_26_20, marks, null);
 		mark_query_params(str, marks, judged);
+		mark_url_passwords(str, marks);
 		mark_shapes(str, marks);
 		mark_labels(str, marks);
 	}
@@ -8505,7 +8668,7 @@
 	*  show its first characters). As the C kernel shows the name of an
 	*  event that is not public (mask_secrets_inline_capped()).
 	***************************************************************/
-	var PEER_NAME_SHOWN = 64;
+	var PEER_NAME_SHOWN = 128;
 	var PEER_FRAME_SHOWN = 256;
 	function peer_text_shown(text, max) {
 		let s = String(text);
@@ -8728,7 +8891,8 @@
 		let url = kw.url;
 		if (kw.ws_seq !== void 0 && kw.ws_seq !== priv.ws_seq) return 0;
 		set_remote_log_functions();
-		log_warning(`${gobj_short_name(gobj)}: WebSocket closed ${url} (Code: ${kw.code}, Reason: "${peer_text_shown(kw.reason, PEER_FRAME_SHOWN)}", Clean: ${kw.was_clean})`);
+		const reason_shown = peer_text_shown(kw.reason === void 0 ? "" : kw.reason, PEER_FRAME_SHOWN);
+		if (is_traffic_tracing(gobj)) trace_msg(`${gobj_short_name(gobj)}: WebSocket closed ${url} (Code: ${kw.code}, Reason: "${reason_shown}", Clean: ${kw.was_clean})`);
 		if (priv.websocket) {
 			priv.websocket.onopen = null;
 			priv.websocket.onmessage = null;
@@ -8738,21 +8902,25 @@
 		}
 		if (priv.inform_on_close) {
 			priv.inform_on_close = false;
+			if ((!kw.was_clean || kw.code !== 1e3 && kw.code !== 1001) && gobj_is_running(gobj)) log_warning(`${gobj_short_name(gobj)}: session closed ${url} (Code: ${kw.code}, Reason: "${reason_shown}", Clean: ${kw.was_clean})`);
 			gobj_publish_event(gobj, "EV_ON_CLOSE", {
 				url,
 				remote_yuno_name: priv.remote_yuno_name,
 				remote_yuno_role: priv.remote_yuno_role,
-				remote_yuno_service: priv.remote_yuno_service
+				remote_yuno_service: priv.remote_yuno_service,
+				code: kw.code,
+				reason: reason_shown,
+				was_clean: kw.was_clean
 			});
 		} else if (!gobj_is_running(gobj)) {} else {
-			log_warning(`${gobj_short_name(gobj)}: EV_ON_OPEN_ERROR cannot open ${url} (Code: ${kw.code}, Reason: "${kw.reason}", Clean: ${kw.was_clean})`);
+			log_warning(`${gobj_short_name(gobj)}: EV_ON_OPEN_ERROR cannot open ${url} (Code: ${kw.code}, Reason: "${reason_shown}", Clean: ${kw.was_clean})`);
 			gobj_publish_event(gobj, "EV_ON_OPEN_ERROR", {
 				url,
 				remote_yuno_name: priv.remote_yuno_name,
 				remote_yuno_role: priv.remote_yuno_role,
 				remote_yuno_service: priv.remote_yuno_service,
 				code: kw.code,
-				reason: kw.reason,
+				reason: reason_shown,
 				was_clean: kw.was_clean
 			});
 		}
@@ -8861,9 +9029,9 @@
 		let iev_event = iev_msg.event;
 		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;
-			} else log_error(`${gobj_short_name(gobj)}: event UNKNOWN in not-session state ${peer_text_shown(iev_event, PEER_NAME_SHOWN)}`);
+			if (String(iev_event).toLowerCase() === "ev_identity_card_ack") {
+				if (!(gobj_send_event(gobj, "EV_IDENTITY_CARD_ACK", iev_kw, gobj) < 0)) return 0;
+			} else log_warning(`${gobj_short_name(gobj)}: event UNKNOWN in not-session state ${peer_text_shown(iev_event, PEER_NAME_SHOWN)}`);
 			close_websocket(gobj);
 			return -1;
 		}
@@ -8871,9 +9039,16 @@
 		let msg_type = msg_iev_get_msg_type(gobj, iev_kw);
 		let event_id = msg_iev_get_stack(gobj, iev_kw, IEVENT_STACK_ID);
 		let iev_dst_role = kw_get_str(gobj, event_id, "dst_role", "");
-		if (iev_dst_role.toLowerCase() !== gobj_yuno_role().toLowerCase()) {
-			log_error(`"It's not my role, dst_role: ${peer_text_shown(iev_dst_role, PEER_NAME_SHOWN)}, my_role: ${gobj_yuno_role()}`);
-			return 0;
+		if (!empty_string(iev_dst_role) && iev_dst_role.toLowerCase() !== String(gobj_yuno_role()).toLowerCase()) {
+			log_warning(`${gobj_short_name(gobj)}: It's not my role, dst_role: ${peer_text_shown(iev_dst_role, PEER_NAME_SHOWN)}, my_role: ${gobj_yuno_role()}, event: ${peer_text_shown(iev_event, PEER_NAME_SHOWN)}`);
+			close_websocket(gobj);
+			return -1;
+		}
+		let iev_dst_yuno = kw_get_str(gobj, event_id, "dst_yuno", "");
+		if (!empty_string(iev_dst_yuno) && iev_dst_yuno.toLowerCase() !== String(gobj_yuno_name()).toLowerCase()) {
+			log_warning(`${gobj_short_name(gobj)}: It's not my name, dst_yuno: ${peer_text_shown(iev_dst_yuno, PEER_NAME_SHOWN)}, my_name: ${gobj_yuno_name()}, event: ${peer_text_shown(iev_event, PEER_NAME_SHOWN)}`);
+			close_websocket(gobj);
+			return -1;
 		}
 		let iev_dst_service = kw_get_str(gobj, event_id, "dst_service", "");
 		if (msg_type === "__subscribing__") {
@@ -8895,13 +9070,18 @@
 				return 0;
 			}
 			if (!gobj_has_event(gobj_service, iev_event, event_flag_t.EVF_PUBLIC_EVENT)) {
-				log_error(`${gobj_short_name(gobj)}: Service found but no event or not public, service '${gobj_short_name(gobj_service)}', ev '${peer_text_shown(iev_event, PEER_NAME_SHOWN)}'`);
+				log_warning(`${gobj_short_name(gobj)}: Service found but no event or not public, DROPPED: service '${gobj_short_name(gobj_service)}', ev '${peer_text_shown(iev_event, PEER_NAME_SHOWN)}'`);
 				return -1;
 			}
 			gobj_send_event(gobj_service, iev_event, iev_kw, gobj);
 			return 0;
 		}
-		gobj_publish_event(gobj, iev_event, iev_kw);
+		let event_type = gobj_find_event_type(iev_event, 0, false);
+		if (!event_type) {
+			log_warning(`${gobj_short_name(gobj)}: event that no gclass declares, DROPPED: ev '${peer_text_shown(iev_event, PEER_NAME_SHOWN)}'`);
+			return -1;
+		}
+		gobj_publish_event(gobj, event_type.event_name, iev_kw);
 		return 0;
 	}
 	/***************************************************************************
@@ -9116,6 +9296,7 @@
 	exports.gobj_deliver_posted_events = gobj_deliver_posted_events;
 	exports.gobj_destroy = gobj_destroy;
 	exports.gobj_find_child = gobj_find_child;
+	exports.gobj_find_event_type = gobj_find_event_type;
 	exports.gobj_find_gobj = gobj_find_gobj;
 	exports.gobj_find_service = gobj_find_service;
 	exports.gobj_find_subscribings = gobj_find_subscribings;