danoniplus 46.4.0 → 46.5.0

package/README.md

@@ -1,7 +1,7 @@
 # Dancing☆Onigiri (CW Edition)
 
 [![CodeQL](https://github.com/cwtickle/danoniplus/workflows/CodeQL/badge.svg)](https://github.com/cwtickle/danoniplus/actions?query=workflow%3ACodeQL)
-![CodeRabbit Pull Request Reviews](https://img.shields.io/coderabbit/prs/github/cwtickle/danoniplus?utm_source=oss&utm_medium=github&utm_campaign=cwtickle%2Fdanoniplus&labelColor=171717&color=FF570A&link=https%3A%2F%2Fcoderabbit.ai&label=CodeRabbit+Reviews&logo=coderabbit)
+[![CodeRabbit Pull Request Reviews](https://img.shields.io/coderabbit/prs/github/cwtickle/danoniplus?utm_source=oss&utm_medium=github&utm_campaign=cwtickle%2Fdanoniplus&labelColor=171717&color=FF570A&link=https%3A%2F%2Fcoderabbit.ai&label=CodeRabbit+Reviews&logo=coderabbit)](https://www.coderabbit.ai/)
 [![Discord](https://img.shields.io/discord/698460971231870977?style=flat&logo=discord&logoColor=%23ffffff&label=Discord&labelColor=%236666ff&color=%23000066)](https://discord.gg/YVWUdUGyMy)
 [![DeepWiki](https://img.shields.io/badge/DeepWiki-cwtickle%2Fdanoniplus-blue.svg?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAyCAYAAAAnWDnqAAAAAXNSR0IArs4c6QAAA05JREFUaEPtmUtyEzEQhtWTQyQLHNak2AB7ZnyXZMEjXMGeK/AIi+QuHrMnbChYY7MIh8g01fJoopFb0uhhEqqcbWTp06/uv1saEDv4O3n3dV60RfP947Mm9/SQc0ICFQgzfc4CYZoTPAswgSJCCUJUnAAoRHOAUOcATwbmVLWdGoH//PB8mnKqScAhsD0kYP3j/Yt5LPQe2KvcXmGvRHcDnpxfL2zOYJ1mFwrryWTz0advv1Ut4CJgf5uhDuDj5eUcAUoahrdY/56ebRWeraTjMt/00Sh3UDtjgHtQNHwcRGOC98BJEAEymycmYcWwOprTgcB6VZ5JK5TAJ+fXGLBm3FDAmn6oPPjR4rKCAoJCal2eAiQp2x0vxTPB3ALO2CRkwmDy5WohzBDwSEFKRwPbknEggCPB/imwrycgxX2NzoMCHhPkDwqYMr9tRcP5qNrMZHkVnOjRMWwLCcr8ohBVb1OMjxLwGCvjTikrsBOiA6fNyCrm8V1rP93iVPpwaE+gO0SsWmPiXB+jikdf6SizrT5qKasx5j8ABbHpFTx+vFXp9EnYQmLx02h1QTTrl6eDqxLnGjporxl3NL3agEvXdT0WmEost648sQOYAeJS9Q7bfUVoMGnjo4AZdUMQku50McDcMWcBPvr0SzbTAFDfvJqwLzgxwATnCgnp4wDl6Aa+Ax283gghmj+vj7feE2KBBRMW3FzOpLOADl0Isb5587h/U4gGvkt5v60Z1VLG8BhYjbzRwyQZemwAd6cCR5/XFWLYZRIMpX39AR0tjaGGiGzLVyhse5C9RKC6ai42ppWPKiBagOvaYk8lO7DajerabOZP46Lby5wKjw1HCRx7p9sVMOWGzb/vA1hwiWc6jm3MvQDTogQkiqIhJV0nBQBTU+3okKCFDy9WwferkHjtxib7t3xIUQtHxnIwtx4mpg26/HfwVNVDb4oI9RHmx5WGelRVlrtiw43zboCLaxv46AZeB3IlTkwouebTr1y2NjSpHz68WNFjHvupy3q8TFn3Hos2IAk4Ju5dCo8B3wP7VPr/FGaKiG+T+v+TQqIrOqMTL1VdWV1DdmcbO8KXBz6esmYWYKPwDL5b5FA1a0hwapHiom0r/cKaoqr+27/XcrS5UwSMbQAAAABJRU5ErkJggg==)](https://deepwiki.com/cwtickle/danoniplus)  
 [![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/cwtickle/danoniplus?sort=semver)](https://github.com/cwtickle/danoniplus/security/policy)
@@ -120,7 +120,7 @@ If you would like to cooperate with the development, please see below. Even if y
 
 ### Dancing☆Onigiri
 
-- [Dancing☆Onigiri Preview](https://danonicw.skr.jp/)
+- [Dancing☆Onigiri Preview](https://danonicw.skr.jp/) ([Repository](https://github.com/cwtickle/danoniplus-preview)) @cwtickle
 - [Dancing☆Onigiri エディター(CW Edition 対応)](https://github.com/superkuppabros/danoni-editor) @superkuppabros
 - [ダンおに曲データjs化ツール](https://github.com/suzme/danoni-base64) @suzme
 - [ダンおに矢印色ツール](https://github.com/suzme/danoni-colorpicker) @suzme
@@ -134,6 +134,7 @@ If you would like to cooperate with the development, please see below. Even if y
 
 ### Kirizma / キリズマ
 
+- [Kirizma (CW Edition)](https://github.com/cwtickle/kirizma-cw) @cwtickle
 - [キリズマ譜面データ変換機](https://github.com/suzme/kirizma-converter) @suzme
 - [キリズマ歌詞表示作成ツール](https://github.com/prlg25/kirizma_lyric) @prlg25
 - [キリズマ難易度表](https://github.com/suzme/kirizma) @suzme

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/03/26
+ * Revised : 2026/03/29
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 46.4.0`;
-const g_revisedDate = `2026/03/26`;
+const g_version = `Ver 46.5.0`;
+const g_revisedDate = `2026/03/29`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -1176,6 +1176,43 @@ const loadMultipleFiles2 = async (_fileData, _loadType) => {
 	}));
 };
 
+/**
+ * ユーザー定義のカスタム関数配列を安全に実行する共通関数
+ * @param {string} _hookName - 識別名
+ * @param {Function[]} _funcArray - カスタム関数の配列
+ * @param {...any} args - 関数に渡したい引数（可変長）
+ */
+const safeExecuteCustomHooks = (_hookName, _funcArray, ...args) => {
+	if (!Array.isArray(_funcArray)) return true;
+	const errorCache = g_errorCache[_hookName];
+
+	for (const [index, func] of _funcArray.entries()) {
+		if (typeof func !== C_TYP_FUNCTION) continue;      // 関数以外が入っていた場合の自衛
+		if (errorCache && errorCache[index]?.has(func)) continue;  // エラー検知済みの場合は以後スキップ
+
+		try {
+			// ...args で受け取った引数をそのまま横流しして実行
+			func(...args);
+		} catch (e) {
+
+			if (!errorCache) {
+				// ループしない場合のエラー処理
+				console.group(`${unEscapeEmoji(g_emojiObj.crossMark)} Custom Function Error: [${_hookName}] (Index: ${index}${func.name ? `, Func: ${func.name}` : ``})`);
+				console.error(e);
+				console.groupEnd();
+
+			} else if (errorCache && !errorCache[index]?.has(func)) {
+				// ループがある場合のエラー処理（初回のみ）
+				console.group(`${unEscapeEmoji(g_emojiObj.crossMark)} Custom Function Error: [${_hookName}] (Index: ${index}${func.name ? `, Func: ${func.name}` : ``})`);
+				console.error(`${unEscapeEmoji(g_emojiObj.policeLight)} [${g_scoreObj.baseFrame} Frame] ${g_msgObj.customFunctionError}`, e);
+				console.groupEnd();
+				errorCache[index] = new Set();
+				errorCache[index].add(func);
+			}
+		}
+	}
+}
+
 /**
  * 与えられたパスより、キーワードとディレクトリに分割
  * @param {string} _fileName 
@@ -2781,7 +2818,7 @@ const initialControl = async () => {
 			}
 		}
 	}
-	g_customJsObj.preTitle.forEach(func => func());
+	safeExecuteCustomHooks(`g_customJsObj.preTitle`, g_customJsObj.preTitle);
 	const queryMusicId = getQueryParamVal(`musicId`);
 	g_settings.musicIdxNum = queryMusicId !== null ? Number(queryMusicId) :
 		g_headerObj.musicGroups?.[g_headerObj.musicNos[g_stateObj.scoreId]] ??
@@ -5395,7 +5432,7 @@ const titleInit = (_initFlg = false) => {
 	}
 
 	// ユーザカスタムイベント(初期)
-	g_customJsObj.title.forEach(func => func());
+	safeExecuteCustomHooks(`g_customJsObj.title`, g_customJsObj.title);
 
 	// バージョン情報取得
 	let customVersion = ``;
@@ -5522,7 +5559,7 @@ const titleInit = (_initFlg = false) => {
 	const flowTitleTimeline = () => {
 
 		// ユーザカスタムイベント(フレーム毎)
-		g_customJsObj.titleEnterFrame.forEach(func => func());
+		safeExecuteCustomHooks(`g_customJsObj.titleEnterFrame`, g_customJsObj.titleEnterFrame);
 
 		// 背景・マスクモーション、スキン変更
 		drawTitleResultMotion(g_currentPage);
@@ -5543,7 +5580,7 @@ const titleInit = (_initFlg = false) => {
 	document.oncontextmenu = () => true;
 	divRoot.oncontextmenu = () => false;
 
-	g_skinJsObj.title.forEach(func => func());
+	safeExecuteCustomHooks(`g_skinJsObj.title`, g_skinJsObj.title);
 };
 
 /**
@@ -6038,7 +6075,7 @@ const changeMSelect = (_num, _initFlg = false) => {
 	}
 
 	// 選曲変更時のカスタム関数実行
-	g_customJsObj.musicSelect.forEach(func => func(g_settings.musicIdxNum));
+	safeExecuteCustomHooks(`g_customJsObj.musicSelect`, g_customJsObj.musicSelect, g_settings.musicIdxNum);
 };
 
 /**
@@ -6268,7 +6305,7 @@ const dataMgtInit = () => {
 	document.getElementById(`btnView${selectedKey}`).click();
 
 	// ユーザカスタムイベント(初期)
-	g_customJsObj.dataMgt.forEach(func => func());
+	safeExecuteCustomHooks(`g_customJsObj.dataMgt`, g_customJsObj.dataMgt);
 
 	multiAppend(divRoot,
 		createCss2Button(`btnBack`, g_lblNameObj.b_back, () => true, {
@@ -6360,7 +6397,7 @@ const dataMgtInit = () => {
 	document.oncontextmenu = () => true;
 	divRoot.oncontextmenu = () => false;
 
-	g_skinJsObj.dataMgt.forEach(func => func());
+	safeExecuteCustomHooks(`g_skinJsObj.dataMgt`, g_skinJsObj.dataMgt);
 };
 
 
@@ -6438,7 +6475,7 @@ const preconditionInit = () => {
 	}, g_cssObj.button_Setting));
 
 	// ユーザカスタムイベント(初期)
-	g_customJsObj.precondition.forEach(func => func());
+	safeExecuteCustomHooks(`g_customJsObj.precondition`, g_customJsObj.precondition);
 
 	multiAppend(divRoot,
 
@@ -6461,7 +6498,7 @@ const preconditionInit = () => {
 	document.oncontextmenu = () => true;
 	divRoot.oncontextmenu = () => true;
 
-	g_skinJsObj.precondition.forEach(func => func());
+	safeExecuteCustomHooks(`g_skinJsObj.precondition`, g_skinJsObj.precondition);
 };
 
 /*-----------------------------------------------------------*/
@@ -6580,7 +6617,7 @@ const updateSettingSummary = () => {
 		`(Adj: ${g_stateObj.adjustment} f, Volume: ${g_stateObj.volume}%, ` +
 		`ColorType: ${g_colorType}, KeyPattern: ${g_keyObj.currentPtn === -1 ? 'Self' : g_keyObj.currentPtn + 1})`;
 
-	g_customJsObj.settingSummary.forEach(func => func());
+	safeExecuteCustomHooks(`g_customJsObj.settingSummary`, g_customJsObj.settingSummary);
 };
 
 /**
@@ -6615,7 +6652,7 @@ const optionInit = () => {
 	createOptionWindow(divRoot);
 
 	// ユーザカスタムイベント(初期)
-	g_customJsObj.option.forEach(func => func());
+	safeExecuteCustomHooks(`g_customJsObj.option`, g_customJsObj.option);
 
 	// ボタン描画
 	commonSettingBtn(`Display`);
@@ -6625,7 +6662,7 @@ const optionInit = () => {
 	document.oncontextmenu = () => true;
 	g_initialFlg = true;
 
-	g_skinJsObj.option.forEach(func => func());
+	safeExecuteCustomHooks(`g_skinJsObj.option`, g_skinJsObj.option);
 };
 
 /**
@@ -7600,7 +7637,7 @@ const setDifficulty = (_initFlg) => {
 	lblMusicInfo.style.fontSize = wUnit(getFontSize2(lblMusicInfo.textContent, g_btnWidth(3 / 4), { maxSiz: 12 }));
 
 	// ユーザカスタムイベント(初期)
-	g_customJsObj.difficulty.forEach(func => func(_initFlg, g_canLoadDifInfoFlg));
+	safeExecuteCustomHooks(`g_customJsObj.difficulty`, g_customJsObj.difficulty, _initFlg, g_canLoadDifInfoFlg);
 
 	// 設定サマリー表示の更新
 	updateSettingSummary();
@@ -8498,7 +8535,7 @@ const settingsDisplayInit = () => {
 	divRoot.appendChild(createDescDiv(`scMsg`, g_lblNameObj.sdShortcutDesc));
 
 	// ユーザカスタムイベント(初期)
-	g_customJsObj.settingsDisplay.forEach(func => func());
+	safeExecuteCustomHooks(`g_customJsObj.settingsDisplay`, g_customJsObj.settingsDisplay);
 
 	// ボタン描画
 	commonSettingBtn(`Settings`);
@@ -8507,7 +8544,7 @@ const settingsDisplayInit = () => {
 	setShortcutEvent(g_currentPage);
 	document.oncontextmenu = () => true;
 
-	g_skinJsObj.settingsDisplay.forEach(func => func());
+	safeExecuteCustomHooks(`g_skinJsObj.settingsDisplay`, g_skinJsObj.settingsDisplay);
 };
 
 /**
@@ -8762,7 +8799,7 @@ const exSettingInit = () => {
 	);
 
 	// ユーザカスタムイベント(初期)
-	g_customJsObj.exSetting.forEach(func => func());
+	safeExecuteCustomHooks(`g_customJsObj.exSetting`, g_customJsObj.exSetting);
 
 	// 設定系のボタン群をまとめて作成（Data Save, Display切替, Back, KeyConfig, Playボタン）
 	commonSettingBtn(g_currentPage);
@@ -8771,7 +8808,7 @@ const exSettingInit = () => {
 	setShortcutEvent(g_currentPage, () => true, { dfEvtFlg: true });
 	document.oncontextmenu = () => true;
 
-	g_skinJsObj.exSetting.forEach(func => func());
+	safeExecuteCustomHooks(`g_skinJsObj.exSetting`, g_skinJsObj.exSetting);
 };
 
 /**
@@ -9594,7 +9631,7 @@ const keyConfigInit = (_kcType = g_kcType) => {
 	};
 
 	// ユーザカスタムイベント(初期)
-	g_customJsObj.keyconfig.forEach(func => func());
+	safeExecuteCustomHooks(`g_customJsObj.keyconfig`, g_customJsObj.keyconfig);
 
 	// 部分キー表示用ボタン描画
 	if (configKeyGroupList.length > 1) {
@@ -9732,7 +9769,7 @@ const keyConfigInit = (_kcType = g_kcType) => {
 		}
 	});
 
-	g_skinJsObj.keyconfig.forEach(func => func());
+	safeExecuteCustomHooks(`g_skinJsObj.keyconfig`, g_skinJsObj.keyconfig);
 	document.onkeyup = evt => commonKeyUp(evt);
 	document.oncontextmenu = () => false;
 };
@@ -9922,7 +9959,7 @@ const loadMusic = () => {
 			lblLoading.textContent = `${g_lblNameObj.nowLoading} ${_event.loaded}Bytes`;
 		}
 		// ユーザカスタムイベント
-		g_customJsObj.progress.forEach(func => func(_event));
+		safeExecuteCustomHooks(`g_customJsObj.progress`, g_customJsObj.progress, _event);
 	});
 
 	// エラー処理
@@ -10030,8 +10067,8 @@ const loadingScoreInit = async () => {
 	g_headerObj.blankFrame = g_headerObj.blankFrameDef;
 
 	// ユーザカスタムイベント
-	g_customJsObj.preloading.forEach(func => func());
-	g_skinJsObj.preloading.forEach(func => func());
+	safeExecuteCustomHooks(`g_customJsObj.preloading`, g_customJsObj.preloading);
+	safeExecuteCustomHooks(`g_skinJsObj.preloading`, g_skinJsObj.preloading);
 
 	let dummyIdHeader = ``;
 	if (g_stateObj.dummyId !== ``) {
@@ -10170,7 +10207,7 @@ const loadingScoreInit = async () => {
 	getArrowSettings();
 
 	// ユーザカスタムイベント
-	g_customJsObj.loading.forEach(func => func());
+	safeExecuteCustomHooks(`g_customJsObj.loading`, g_customJsObj.loading);
 
 	mainInit();
 };
@@ -12669,7 +12706,7 @@ const mainInit = () => {
 	}
 
 	// ユーザカスタムイベント(初期)
-	g_customJsObj.main.forEach(func => func());
+	safeExecuteCustomHooks(`g_customJsObj.main`, g_customJsObj.main);
 
 	/**
 	 * キーを押したときの処理
@@ -12917,7 +12954,7 @@ const mainInit = () => {
 			if (_cnt === 0) {
 				const stepDivHit = document.getElementById(`stepHit${_j}`);
 
-				g_customJsObj.dummyArrow.forEach(func => func());
+				safeExecuteCustomHooks(`g_customJsObj.dummyArrow`, g_customJsObj.dummyArrow);
 				stepDivHit.style.top = wUnit(-15);
 				stepDivHit.style.opacity = 1;
 				stepDivHit.classList.value = ``;
@@ -12937,7 +12974,7 @@ const mainInit = () => {
 
 		// ダミーフリーズアロー(成功時)
 		dummyFrzOK: (_j, _k, _frzName, _cnt) => {
-			g_customJsObj.dummyFrz.forEach(func => func());
+			safeExecuteCustomHooks(`g_customJsObj.dummyFrz`, g_customJsObj.dummyFrz);
 			$id(`frzHit${_j}`).opacity = 0;
 			g_attrObj[_frzName].judgEndFlg = true;
 			judgeObjDelete.dummyFrz(_j, _frzName);
@@ -13157,7 +13194,7 @@ const mainInit = () => {
 		arrowSubRoot.appendChild(createColorObject2(`${_name}Top${_j}_${_arrowCnt}`, {
 			background: _color, rotate: g_workObj.arrowRtn[_j],
 		}));
-		g_customJsObj.makeArrow.forEach(func => func(_attrs, arrowName, _name, _arrowCnt));
+		safeExecuteCustomHooks(`g_customJsObj.makeArrow`, g_customJsObj.makeArrow, _attrs, arrowName, _name, _arrowCnt);
 	};
 
 	/**
@@ -13326,7 +13363,7 @@ const mainInit = () => {
 			addTransform(frzName, `rootX`, `translateX(${g_workObj.stepX[_j]}px)`);
 		}
 
-		g_customJsObj.makeFrzArrow.forEach(func => func(_attrs, frzName, _name, _arrowCnt));
+		safeExecuteCustomHooks(`g_customJsObj.makeFrzArrow`, g_customJsObj.makeFrzArrow, _attrs, frzName, _name, _arrowCnt);
 	};
 
 	/**
@@ -13445,7 +13482,7 @@ const mainInit = () => {
 		}
 
 		// ユーザカスタムイベント(フレーム毎)
-		g_customJsObj.mainEnterFrame.forEach(func => func());
+		safeExecuteCustomHooks(`g_customJsObj.mainEnterFrame`, g_customJsObj.mainEnterFrame);
 
 		// 速度変化 (途中変速, 個別加速)
 		while (currentFrame >= g_workObj.speedData?.[speedCnts]) {
@@ -13643,7 +13680,7 @@ const mainInit = () => {
 			g_timeoutEvtId = setTimeout(flowTimeline, 1000 / g_fps - buffTime);
 		}
 	};
-	g_skinJsObj.main.forEach(func => func());
+	safeExecuteCustomHooks(`g_skinJsObj.main`, g_skinJsObj.main);
 
 	g_audio.currentTime = firstFrame / g_fps * g_headerObj.playbackRate;
 	g_audio.playbackRate = g_headerObj.playbackRate;
@@ -13863,7 +13900,7 @@ const changeAppearanceFilter = (_num = 10) => {
 	}
 
 	// ユーザカスタムイベント(アルファマスクの再描画)
-	g_customJsObj.appearanceFilter.forEach(func => func(topNum, bottomNum));
+	safeExecuteCustomHooks(`g_customJsObj.appearanceFilter`, g_customJsObj.appearanceFilter, topNum, bottomNum);
 
 	return doubleFilterFlg;
 };
@@ -14187,7 +14224,7 @@ const changeHitFrz = (_j, _k, _name, _difFrame = 0) => {
 	if (g_stateObj.frzReturn !== C_FLG_OFF) {
 		startFrzReturn();
 	}
-	g_customJsObj[`judg_${_name}Hit`].forEach(func => func(_difFrame));
+	safeExecuteCustomHooks(`g_customJsObj.judg_${_name}Hit`, g_customJsObj[`judg_${_name}Hit`], _difFrame);
 };
 
 /**
@@ -14444,7 +14481,7 @@ const judgeRecovery = (_name, _difFrame) => {
 	if (_name === `shakin`) {
 		quickRetry(`Shakin(Great)`);
 	}
-	g_customJsObj[`judg_${_name}`].forEach(func => func(_difFrame));
+	safeExecuteCustomHooks(`g_customJsObj.judg_${_name}`, g_customJsObj[`judg_${_name}`], _difFrame);
 };
 
 /**
@@ -14458,7 +14495,7 @@ const judgeDamage = (_name, _difFrame) => {
 	comboJ.textContent = ``;
 	diffJ.textContent = ``;
 	lifeDamage();
-	g_customJsObj[`judg_${_name}`].forEach(func => func(_difFrame));
+	safeExecuteCustomHooks(`g_customJsObj.judg_${_name}`, g_customJsObj[`judg_${_name}`], _difFrame);
 };
 
 /**
@@ -14483,7 +14520,7 @@ const judgeMatari = _difFrame => {
 	finishViewing();
 	quickRetry(`Matari(Good)`);
 
-	g_customJsObj.judg_matari.forEach(func => func(_difFrame));
+	safeExecuteCustomHooks(`g_customJsObj.judg_matari`, g_customJsObj.judg_matari, _difFrame);
 };
 
 /**
@@ -14514,7 +14551,7 @@ const judgeKita = _difFrame => {
 	lifeRecovery();
 	finishViewing();
 
-	g_customJsObj.judg_kita.forEach(func => func(_difFrame));
+	safeExecuteCustomHooks(`g_customJsObj.judg_kita`, g_customJsObj.judg_kita, _difFrame);
 };
 
 /**
@@ -14528,7 +14565,7 @@ const judgeIknai = _difFrame => {
 
 	lifeDamage();
 
-	g_customJsObj.judg_iknai.forEach(func => func(_difFrame));
+	safeExecuteCustomHooks(`g_customJsObj.judg_iknai`, g_customJsObj.judg_iknai, _difFrame);
 };
 
 const jdgList = [`ii`, `shakin`, `matari`, `shobon`].map(jdg => toCapitalize(jdg));
@@ -14990,7 +15027,7 @@ const resultInit = () => {
 
 	// ユーザカスタムイベント(初期)
 	const currentDateTime = new Date().toLocaleString();
-	g_customJsObj.result.forEach(func => func());
+	safeExecuteCustomHooks(`g_customJsObj.result`, g_customJsObj.result);
 
 	if (highscorePreCondition) {
 
@@ -15334,7 +15371,7 @@ const resultInit = () => {
 	const flowResultTimeline = () => {
 
 		// ユーザカスタムイベント(フレーム毎)
-		g_customJsObj.resultEnterFrame.forEach(func => func());
+		safeExecuteCustomHooks(`g_customJsObj.resultEnterFrame`, g_customJsObj.resultEnterFrame);
 
 		// 背景・マスクモーション、スキン変更
 		drawTitleResultMotion(g_currentPage);
@@ -15368,7 +15405,7 @@ const resultInit = () => {
 	setShortcutEvent(g_currentPage, () => true, { dfEvtFlg: true });
 	document.oncontextmenu = () => true;
 
-	g_skinJsObj.result.forEach(func => func());
+	safeExecuteCustomHooks(`g_skinJsObj.result`, g_skinJsObj.result);
 };
 
 /**

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2026/03/26 (v46.4.0)
+ * Revised : 2026/03/29 (v46.5.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -963,6 +963,7 @@ const g_escapeStr = {
 const g_emojiObj = {
     checkMark: `✔`,    // チェックマーク (check mark)
     crossMark: `❌`,    // バツ (cross mark)
+    policeLight: `🚨`, // パトランプ (police car light)
     muted: `🔇`,       // 無音のスピーカー (muted speaker)
     speaker: `🔊`,     // 音量大のスピーカー (speaker high volume)
     shield: `🛡`,      // 盾 (shield)
@@ -4827,6 +4828,8 @@ const g_lang_msgObj = {
         pickColorR: `設定する矢印色の種類を切り替えます。`,
         pickColorCopy: `このボタンを押すと、フリーズアローの配色を矢印（枠）の色で上書きします。\nヒット時のフリーズアローの色も上書きします。`,
         pickColorReset: `矢印・フリーズアローの配色を元に戻します。`,
+
+        customFunctionError: `初回の実行エラーが発生しました。修正されるまでこの処理は無視されます。`,
     },
 
     En: {
@@ -4925,6 +4928,8 @@ const g_lang_msgObj = {
         pickColorR: `Switches the arrow color type to be set.`,
         pickColorCopy: `Pressing this button will override the color scheme of the freeze arrow with the frame color of the arrow. \nIt also overrides the color of the freeze arrow on hit.`,
         pickColorReset: `Restore the color scheme for arrows and freeze arrows.`,
+
+        customFunctionError: `An error occurred during the first execution. This process will be ignored until the error is resolved.`,
     },
 
 };
@@ -5009,6 +5014,12 @@ const g_skinJsObj = {
     result: [],
 };
 
+const g_errorCache = {
+    'g_customJsObj.titleEnterFrame': [],
+    'g_customJsObj.mainEnterFrame': [],
+    'g_customJsObj.resultEnterFrame': [],
+};
+
 /**
  * 従来のカスタム関数をg_customJsObj, g_skinJsObjへ追加
  * - customjsファイルを読み込んだ直後にこの関数を呼び出している

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "danoniplus",
-  "version": "46.4.0",
+  "version": "46.5.0",
   "description": "Dancing☆Onigiri (CW Edition) - Web-based Rhythm Game",
   "main": "./js/danoni_main.js",
   "jsdelivr": "./js/danoni_main.js",