@elementor/editor-audits 4.4.0-1073 → 4.4.0-1075

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elementor/editor-audits",
-  "version": "4.4.0-1073",
+  "version": "4.4.0-1075",
   "private": false,
   "author": "Elementor Team",
   "homepage": "https://elementor.com/",
@@ -39,19 +39,19 @@
     "dev": "tsup --config=../../tsup.dev.ts"
   },
   "dependencies": {
-    "@elementor/editor": "4.4.0-1073",
-    "@elementor/editor-mcp": "4.4.0-1073",
-    "@elementor/editor-app-bar": "4.4.0-1073",
-    "@elementor/editor-elements": "4.4.0-1073",
-    "@elementor/editor-floating-panels": "4.4.0-1073",
-    "@elementor/editor-notifications": "4.4.0-1073",
-    "@elementor/editor-v1-adapters": "4.4.0-1073",
-    "@elementor/events": "4.4.0-1073",
-    "@elementor/http-client": "4.4.0-1073",
+    "@elementor/editor": "4.4.0-1075",
+    "@elementor/editor-mcp": "4.4.0-1075",
+    "@elementor/editor-app-bar": "4.4.0-1075",
+    "@elementor/editor-elements": "4.4.0-1075",
+    "@elementor/editor-floating-panels": "4.4.0-1075",
+    "@elementor/editor-notifications": "4.4.0-1075",
+    "@elementor/editor-v1-adapters": "4.4.0-1075",
+    "@elementor/events": "4.4.0-1075",
+    "@elementor/http-client": "4.4.0-1075",
     "@elementor/icons": "~1.77.0",
-    "@elementor/locations": "4.4.0-1073",
-    "@elementor/session": "4.4.0-1073",
-    "@elementor/store": "4.4.0-1073",
+    "@elementor/locations": "4.4.0-1075",
+    "@elementor/session": "4.4.0-1075",
+    "@elementor/store": "4.4.0-1075",
     "@elementor/ui": "1.37.5"
   },
   "peerDependencies": {

package/src/api/page-context-client.ts

@@ -1,19 +1,38 @@
 import { httpService } from '@elementor/http-client';
 
 import { type PageContextResponse } from '../types';
+import { isNonceInvalidError, refreshAuditsNonce } from '../utils/session-expiration';
 import { getWindowConfig } from '../utils/window-config';
 
 export async function fetchPageContext( documentId: number, attachmentIds: number[] ): Promise< PageContextResponse > {
+	return requestPageContext( documentId, attachmentIds, true );
+}
+
+async function requestPageContext(
+	documentId: number,
+	attachmentIds: number[],
+	allowNonceRetry: boolean
+): Promise< PageContextResponse > {
 	const { restNamespace, nonce } = getWindowConfig();
 	const url = `${ restNamespace }/audits/page-context`;
 
-	const response = await httpService().get< PageContextResponse >( url, {
-		params: {
-			document_id: documentId,
-			attachment_ids: attachmentIds,
-		},
-		headers: { 'X-WP-Nonce': nonce },
-	} );
+	try {
+		const response = await httpService().get< PageContextResponse >( url, {
+			params: {
+				document_id: documentId,
+				attachment_ids: attachmentIds,
+			},
+			headers: { 'X-WP-Nonce': nonce },
+		} );
+
+		return response.data;
+	} catch ( error ) {
+		if ( ! allowNonceRetry || ! isNonceInvalidError( error ) ) {
+			throw error;
+		}
+
+		await refreshAuditsNonce();
 
-	return response.data;
+		return requestPageContext( documentId, attachmentIds, false );
+	}
 }

package/src/hooks/use-audit-report.ts

@@ -5,6 +5,7 @@ import { __useDispatch as useDispatch, __useSelector as useSelector } from '@ele
 import { runPageAudit } from '../runner';
 import { type GlobalState, selectError, selectReport, selectStatus, slice } from '../store';
 import { getPersistedReport, persistReport } from '../utils/report-storage';
+import { SessionExpiredError } from '../utils/session-expiration';
 
 export function useAuditReport() {
 	const status = useSelector( ( state: GlobalState ) => selectStatus( state ) );
@@ -35,6 +36,11 @@ export function useAuditReport() {
 			dispatch( slice.actions.runSucceeded( nextReport ) );
 			persistReport( documentIdToRun, nextReport );
 		} catch ( e ) {
+			if ( e instanceof SessionExpiredError ) {
+				dispatch( slice.actions.runAborted() );
+				return;
+			}
+
 			dispatch( slice.actions.runFailed( e instanceof Error ? e.message : 'Unknown error' ) );
 		}
 	};

package/src/store/slice.ts

@@ -26,6 +26,9 @@ export const slice = __createSlice( {
 			state.status = 'error';
 			state.error = action.payload;
 		},
+		runAborted( state ) {
+			state.status = state.report ? 'ready' : 'idle';
+		},
 		reportRestored( state, action: PayloadAction< PageAuditReport > ) {
 			state.status = 'ready';
 			state.report = action.payload;

package/src/utils/session-expiration.ts

@@ -0,0 +1,63 @@
+import { getWindowConfig } from './window-config';
+
+const NONCE_INVALID_CODE = 'rest_cookie_invalid_nonce';
+const DEFAULT_AJAX_URL = '/wp-admin/admin-ajax.php';
+
+type AjaxErrorLikeResponse = {
+	status?: number;
+	data?: { code?: string };
+};
+
+type AjaxErrorLike = {
+	response?: AjaxErrorLikeResponse;
+};
+
+type SessionWindow = Window & {
+	elementorCommon?: { ajax?: { config?: { url?: string } } };
+};
+
+export class SessionExpiredError extends Error {}
+
+let nonceRefreshPromise: Promise< string > | null = null;
+
+export function isNonceInvalidError( error: unknown ): boolean {
+	const response = ( error as AjaxErrorLike | undefined )?.response;
+
+	return response?.status === 403 && response?.data?.code === NONCE_INVALID_CODE;
+}
+
+export async function refreshAuditsNonce(): Promise< string > {
+	if ( nonceRefreshPromise ) {
+		return nonceRefreshPromise;
+	}
+
+	nonceRefreshPromise = requestFreshNonce();
+
+	try {
+		return await nonceRefreshPromise;
+	} finally {
+		nonceRefreshPromise = null;
+	}
+}
+
+async function requestFreshNonce(): Promise< string > {
+	const ajaxUrl = ( window as SessionWindow ).elementorCommon?.ajax?.config?.url ?? DEFAULT_AJAX_URL;
+	const url = new URL( ajaxUrl, window.location.origin );
+	url.searchParams.set( 'action', 'rest-nonce' );
+
+	const response = await fetch( url.toString(), { credentials: 'same-origin' } );
+
+	if ( ! response.ok ) {
+		throw new Error( `Failed to refresh audits nonce: HTTP ${ response.status }` );
+	}
+
+	const nonce = await response.text();
+
+	if ( ! nonce || '0' === nonce ) {
+		throw new SessionExpiredError( 'Session expired — received invalid nonce' );
+	}
+
+	window.elementorAudits = { ...getWindowConfig(), nonce };
+
+	return nonce;
+}