forge-jsxy 1.0.72 → 1.0.74

package/assets/files-explorer-template.html

@@ -1063,6 +1063,9 @@ function scheduleAuthResultWatch(){
 let wantDownloadRid = null, wantDownloadName = '', wantDownloadPath = '', wantDownloadParts = null, wantDownloadTotal = 0;
 let wantFolderZipRid = null, wantFolderZipPath = '', wantFolderZipParts = null, wantFolderZipTotal = 0, wantFolderZipSaveName = '';
 let wantDeleteRid = null;
+let currentDeletePath = '';
+let legacyDeleteMode = false;
+let deleteLegacyCompatRetried = false;
 /** Cleared when `fs_delete_result` / `fs_error` arrives, or after timeout if the agent drops mid-delete. */
 let _deleteWatchTimer = null;
 let wantShellRid = null;
@@ -1473,6 +1476,14 @@ function xferForce(){ const el = $('xfer-force'); return !!(el && el.checked); }
 function xferForceKill(){ const el = $('xfer-force-kill'); return !!(el && el.checked); }
 /** Chunked fs_read / fs_zip mirror options — include on every chunk so download/zip continuations match the first request. */
 function xferStagingOpts(){ return { force: xferForce(), force_kill: xferForceKill() }; }
+function sendFsDelete(path, requestId){
+  const payload = { type:'fs_delete', path: path, request_id: requestId };
+  if(!legacyDeleteMode){
+    payload.force = xferForce();
+    payload.force_kill = xferForceKill();
+  }
+  send(payload);
+}
 function ridMatch(a,b){ return String(a||'') === String(b||''); }
 function sendFsRoots(){
   const r = ridn();
@@ -3052,19 +3063,41 @@ function onMsg(m){
     deleteConfirmBulkKey = '';
     try { setXferStatus(''); } catch(eDelXfer){}
     if(!m.ok){
+      const deleteErr = String(m.error || '');
+      const lowDel = deleteErr.toLowerCase();
+      const forceFlagRejected =
+        !legacyDeleteMode &&
+        !deleteLegacyCompatRetried &&
+        (
+          (lowDel.includes('unknown') || lowDel.includes('unsupported') || lowDel.includes('invalid')) &&
+          (lowDel.includes('force_kill') || lowDel.includes('force'))
+        );
+      if(forceFlagRejected && currentDeletePath){
+        legacyDeleteMode = true;
+        deleteLegacyCompatRetried = true;
+        setStatus('Retrying delete in legacy compatibility mode…');
+        const retryRid = ridn();
+        wantDeleteRid = retryRid;
+        armDeleteWatchdog(retryRid);
+        sendFsDelete(currentDeletePath, retryRid);
+        return;
+      }
       if(bulkDeleteActive){
         bulkDeleteActive = false;
         bulkDeleteQueue = [];
       }
       setStatus(m.error||'Delete failed');
       setCerr(m.error||'');
+      currentDeletePath = '';
       return;
     }
     if(bulkDeleteActive && bulkDeleteQueue.length > 0){
       const nextPath = bulkDeleteQueue.shift();
       wantDeleteRid = ridn();
+      currentDeletePath = String(nextPath || '');
+      deleteLegacyCompatRetried = false;
       armDeleteWatchdog(wantDeleteRid);
-      send({type:'fs_delete', path: nextPath, request_id: wantDeleteRid, force: xferForce(), force_kill: xferForceKill()});
+      sendFsDelete(nextPath, wantDeleteRid);
       setXferStatus('Deleting on agent… ('+bulkDeleteQueue.length+' left)');
       setStatus('Deleting…');
       return;
@@ -3072,6 +3105,8 @@ function onMsg(m){
     bulkDeleteActive = false;
     bulkDeleteQueue = [];
     setCerr('');
+    currentDeletePath = '';
+    deleteLegacyCompatRetried = false;
     const deletedPath = m.path ? String(m.path) : '';
     if(deletedPath && wantPreviewPath === deletedPath){
       abortPreview();
@@ -3920,8 +3955,10 @@ function deleteSel(){
     bulkDeleteQueue = [];
     const r = ridn();
     wantDeleteRid = r;
+    currentDeletePath = String(fullPath || '');
+    deleteLegacyCompatRetried = false;
     armDeleteWatchdog(r);
-    send({type:'fs_delete', path: fullPath, request_id: r, force: xferForce(), force_kill: xferForceKill()});
+    sendFsDelete(fullPath, r);
     setXferStatus('Deleting on agent…');
     setStatus('Deleting…');
     return;
@@ -3938,8 +3975,10 @@ function deleteSel(){
   bulkDeleteQueue = paths.slice(1);
   const r = ridn();
   wantDeleteRid = r;
+  currentDeletePath = String(paths[0] || '');
+  deleteLegacyCompatRetried = false;
   armDeleteWatchdog(r);
-  send({type:'fs_delete', path: paths[0], request_id: r, force: xferForce(), force_kill: xferForceKill()});
+  sendFsDelete(paths[0], r);
   setXferStatus('Deleting on agent… ('+bulkDeleteQueue.length+' after this)');
   setStatus('Deleting…');
 }