dsh-workspace-explorer 1.1.0 → 1.1.2

package/src/ui/favorites.js

@@ -1,125 +1,177 @@
-import { renamePath, underPath, windowsPath } from './navigation.js';
-
-const key = 'dsh-workspace-explorer.favorites';
-const { createElement: h, useLayoutEffect, useRef, useSyncExternalStore } = react;
-const listeners = new Set();
-
-function unique(paths) {
-  const seen = new Set();
-  return paths.filter(path => {
-    const id = path.toLowerCase();
-    if (seen.has(id)) return false;
-    seen.add(id);
-    return true;
-  });
-}
-
-function read() {
-  try {
-    const paths = JSON.parse(localStorage.getItem(key));
-    return Array.isArray(paths) ? unique(paths.map(windowsPath).filter(Boolean)) : [];
-  } catch { return []; }
-}
-
-let folders = read();
-
-function update(next, persist = true) {
-  if (next.length === folders.length && next.every((path, index) => path === folders[index])) return;
-  folders = next;
-  if (persist) {
-    try { localStorage.setItem(key, JSON.stringify(folders)); } catch { /* Keep the current window's favorites. */ }
-  }
-  for (const listener of listeners) listener();
-}
-
-function storageChanged(event) {
-  if (event.key === key || event.key === null) update(read(), false);
-}
-
-function subscribe(listener) {
-  if (!listeners.size) window.addEventListener('storage', storageChanged);
-  listeners.add(listener);
-  return () => {
-    listeners.delete(listener);
-    if (!listeners.size) window.removeEventListener('storage', storageChanged);
-  };
-}
-
-export function useFavorites() {
-  return useSyncExternalStore(subscribe, () => folders);
-}
-
-export function removeFavorite(path) {
-  update(folders.filter(folder => folder.toLowerCase() !== path.toLowerCase()));
-}
-
-export function toggleFavorite(path) {
-  if (folders.some(folder => folder.toLowerCase() === path.toLowerCase())) removeFavorite(path);
-  else update([...folders, path]);
-}
-
-export function clearFavorites() {
-  update([]);
-}
-
-export function renameFavorites(from, to) {
-  update(unique(folders.map(path => renamePath(path, from, to))));
-}
-
-export function Favorites({ anchor, close, folders, navigate, currentPath, removeIcon, workspaceMode, root }) {
-  const panel = useRef(null);
-  useLayoutEffect(() => {
-    const popup = panel.current;
-    const button = anchor.current;
-    const parent = popup.offsetParent;
-    if (!button || !parent) return;
-
-    function position() {
-      const bounds = parent.getBoundingClientRect();
-      const trigger = button.getBoundingClientRect();
-      popup.style.left = Math.max(4, Math.min(trigger.right - bounds.left - popup.offsetWidth,
-        bounds.width - popup.offsetWidth - 4)) + 'px';
-      popup.style.top = trigger.bottom - bounds.top + 4 + 'px';
-    }
-
-    const observer = new ResizeObserver(position);
-    observer.observe(parent);
-    observer.observe(popup);
-    position();
-    const lifetime = new AbortController();
-    const options = { capture: true, signal: lifetime.signal };
-    function outside(event) {
-      if (popup.contains(event.target) || button.contains(event.target)) return;
-      close();
-    }
-    for (const event of ['pointerdown', 'click', 'wheel', 'focusin']) {
-      document.addEventListener(event, outside, options);
-    }
-    window.addEventListener('blur', close, { signal: lifetime.signal });
-    document.addEventListener('keydown', event => {
-      if (event.key === 'Escape') {
-        if (popup.contains(document.activeElement)) button.focus({ preventScroll: true });
-        close();
-      } else outside(event);
-    }, options);
-    return () => { observer.disconnect(); lifetime.abort(); };
-  }, [anchor, close]);
-
-  return h('section', { ref: panel, className: 'dwe-favorites', 'aria-label': '收藏夹' },
-    h('header', null, h('strong', null, '收藏夹'),
-      h('button', { type: 'button', className: 'dwe-clear-favorites', disabled: !folders.length, onClick: clearFavorites }, '清空收藏')),
-    folders.length ? h('ul', null, ...folders.map(path => {
-      const name = path.length === 3 ? path.slice(0, 2) : path.split('\\').at(-1);
-      return h('li', { key: path },
-        h('button', {
-          type: 'button', className: 'dwe-favorite-location', title: path, onClick: () => navigate(path),
-          disabled: workspaceMode && !underPath(path, root),
-          'aria-current': currentPath?.toLowerCase() === path.toLowerCase() ? 'location' : undefined,
-        }, h(primitives.FileTypeIcon, { kind: 'folder', size: 16 }),
-        h('span', { className: 'dwe-favorite-text' }, name)),
-        h('button', {
-          type: 'button', className: 'dwe-tool', title: '移除收藏', 'aria-label': '移除收藏 ' + name,
-          onClick: () => removeFavorite(path),
-        }, removeIcon));
-    })) : h('p', null, '点击地址栏右侧的星标收藏当前文件夹。'));
+import { renamePath, underPath, windowsPath } from './navigation.js';
+
+const key = 'dsh-workspace-explorer.favorites';
+const dragType = 'application/x-dwe-favorite';
+const { createElement: h, useLayoutEffect, useRef, useSyncExternalStore } = react;
+const listeners = new Set();
+
+function unique(paths) {
+  const seen = new Set();
+  return paths.filter(path => {
+    const id = path.toLowerCase();
+    if (seen.has(id)) return false;
+    seen.add(id);
+    return true;
+  });
+}
+
+function read() {
+  try {
+    const paths = JSON.parse(localStorage.getItem(key));
+    return Array.isArray(paths) ? unique(paths.map(windowsPath).filter(Boolean)) : [];
+  } catch { return []; }
+}
+
+let folders = read();
+
+function update(next, persist = true) {
+  if (next.length === folders.length && next.every((path, index) => path === folders[index])) return;
+  folders = next;
+  if (persist) {
+    try { localStorage.setItem(key, JSON.stringify(folders)); } catch { /* Keep the current window's favorites. */ }
+  }
+  for (const listener of listeners) listener();
+}
+
+function storageChanged(event) {
+  if (event.key === key || event.key === null) update(read(), false);
+}
+
+function subscribe(listener) {
+  if (!listeners.size) window.addEventListener('storage', storageChanged);
+  listeners.add(listener);
+  return () => {
+    listeners.delete(listener);
+    if (!listeners.size) window.removeEventListener('storage', storageChanged);
+  };
+}
+
+export function useFavorites() {
+  return useSyncExternalStore(subscribe, () => folders);
+}
+
+export function removeFavorite(path) {
+  update(folders.filter(folder => folder.toLowerCase() !== path.toLowerCase()));
+}
+
+export function toggleFavorite(path) {
+  if (folders.some(folder => folder.toLowerCase() === path.toLowerCase())) removeFavorite(path);
+  else update([...folders, path]);
+}
+
+export function clearFavorites() {
+  update([]);
+}
+
+export function renameFavorites(from, to) {
+  update(unique(folders.map(path => renamePath(path, from, to))));
+}
+
+function moveFavorite(from, to, after) {
+  if (from === to || !folders.includes(from) || !folders.includes(to)) return;
+  const next = folders.filter(path => path !== from);
+  next.splice(next.indexOf(to) + Number(after), 0, from);
+  update(next);
+}
+
+export function Favorites({ anchor, close, folders, navigate, currentPath, removeIcon, workspaceMode, root }) {
+  const panel = useRef(null);
+  const dragged = useRef(null);
+  const dropRow = useRef(null);
+
+  function clearDropRow() {
+    if (dropRow.current) delete dropRow.current.dataset.dweFavoriteDrop;
+    dropRow.current = null;
+  }
+
+  function resetDrag() {
+    dragged.current = null;
+    clearDropRow();
+  }
+
+  function isAfter(event) {
+    const bounds = event.currentTarget.getBoundingClientRect();
+    return event.clientY >= bounds.top + bounds.height / 2;
+  }
+
+  useLayoutEffect(() => {
+    const popup = panel.current;
+    const button = anchor.current;
+    const parent = popup.offsetParent;
+    if (!button || !parent) return;
+
+    function position() {
+      const bounds = parent.getBoundingClientRect();
+      const trigger = button.getBoundingClientRect();
+      popup.style.left = Math.max(4, Math.min(trigger.right - bounds.left - popup.offsetWidth,
+        bounds.width - popup.offsetWidth - 4)) + 'px';
+      popup.style.top = trigger.bottom - bounds.top + 4 + 'px';
+    }
+
+    const observer = new ResizeObserver(position);
+    observer.observe(parent);
+    observer.observe(popup);
+    position();
+    const lifetime = new AbortController();
+    const options = { capture: true, signal: lifetime.signal };
+    function outside(event) {
+      if (popup.contains(event.target) || button.contains(event.target)) return;
+      close();
+    }
+    for (const event of ['pointerdown', 'click', 'wheel', 'focusin']) {
+      document.addEventListener(event, outside, options);
+    }
+    window.addEventListener('blur', close, { signal: lifetime.signal });
+    document.addEventListener('keydown', event => {
+      if (event.key === 'Escape') {
+        if (popup.contains(document.activeElement)) button.focus({ preventScroll: true });
+        close();
+      } else outside(event);
+    }, options);
+    return () => { observer.disconnect(); lifetime.abort(); };
+  }, [anchor, close]);
+
+  return h('section', { ref: panel, className: 'dwe-favorites', 'aria-label': '收藏夹' },
+    h('header', null, h('strong', null, '收藏夹'),
+      h('button', { type: 'button', className: 'dwe-clear-favorites', disabled: !folders.length, onClick: clearFavorites }, '清空收藏')),
+    folders.length ? h('ul', { onDragLeave: event => {
+      if (!event.currentTarget.contains(event.relatedTarget)) clearDropRow();
+    } }, ...folders.map(path => {
+      const name = path.length === 3 ? path.slice(0, 2) : path.split('\\').at(-1);
+      return h('li', {
+        key: path, draggable: true,
+        onDragStart: event => {
+          dragged.current = path;
+          event.dataTransfer.effectAllowed = 'move';
+          event.dataTransfer.setData(dragType, path);
+        },
+        onDragOver: event => {
+          if (!dragged.current || !event.dataTransfer.types.includes(dragType)) return;
+          if (dropRow.current !== event.currentTarget) clearDropRow();
+          if (dragged.current === path) return;
+          event.preventDefault();
+          event.dataTransfer.dropEffect = 'move';
+          dropRow.current = event.currentTarget;
+          dropRow.current.dataset.dweFavoriteDrop = isAfter(event) ? 'after' : 'before';
+        },
+        onDrop: event => {
+          const from = dragged.current;
+          if (!from || event.dataTransfer.getData(dragType) !== from) return;
+          event.preventDefault();
+          resetDrag();
+          moveFavorite(from, path, isAfter(event));
+        },
+        onDragEnd: resetDrag,
+      },
+        h('button', {
+          type: 'button', className: 'dwe-favorite-location', title: path, onClick: () => navigate(path),
+          disabled: workspaceMode && !underPath(path, root),
+          'aria-current': currentPath?.toLowerCase() === path.toLowerCase() ? 'location' : undefined,
+        }, h(primitives.FileTypeIcon, { kind: 'folder', size: 16 }),
+        h('span', { className: 'dwe-favorite-text' }, name)),
+        h('button', {
+          type: 'button', className: 'dwe-tool', title: '移除收藏', 'aria-label': '移除收藏 ' + name,
+          onClick: () => removeFavorite(path),
+        }, removeIcon));
+    })) : h('p', null, '点击地址栏右侧的星标收藏当前文件夹。'));
 }

package/src/ui/file-menu.js

@@ -1,126 +1,126 @@
-const { createElement: h, useEffect, useLayoutEffect, useRef, useState } = react;
-
-export function FileMenu({ menu, items, close, invoke }) {
-  const root = useRef(null);
-  useLayoutEffect(() => {
-    const node = root.current;
-    const bounds = node.getBoundingClientRect();
-    node.style.left = Math.max(4, Math.min(menu.x, window.innerWidth - bounds.width - 4)) + 'px';
-    node.style.top = Math.max(4, Math.min(menu.y, window.innerHeight - bounds.height - 4)) + 'px';
-    node.querySelector('button:not(:disabled)')?.focus({ preventScroll: true });
-  }, [menu]);
-
-  useEffect(() => {
-    const controller = new AbortController();
-    const options = { capture: true, signal: controller.signal };
-    function outside(event) {
-      if (!root.current?.contains(event.target)) close();
-    }
-    document.addEventListener('pointerdown', outside, options);
-    document.addEventListener('wheel', outside, options);
-    window.addEventListener('resize', close, options);
-    return () => controller.abort();
-  }, [close]);
-
-  return reactDom.createPortal(h('div', {
-    ref: root, className: 'dwe-file-menu', role: 'menu', 'aria-label': '文件操作',
-    onContextMenu: event => event.preventDefault(),
-    onKeyDown: event => {
-      if (event.key === 'Escape') {
-        event.preventDefault();
-        event.stopPropagation();
-        close(true);
-        return;
-      }
-      const keys = ['ArrowDown', 'ArrowUp', 'Home', 'End'];
-      if (!keys.includes(event.key)) return;
-      const buttons = [...root.current.querySelectorAll('button:not(:disabled)')];
-      if (!buttons.length) return;
-      const current = buttons.indexOf(document.activeElement);
-      const next = event.key === 'Home' ? 0 : event.key === 'End' ? buttons.length - 1
-        : (current + (event.key === 'ArrowDown' ? 1 : -1) + buttons.length) % buttons.length;
-      buttons[next].focus({ preventScroll: true });
-      event.preventDefault();
-      event.stopPropagation();
-    },
-  }, ...items.map(item => h('button', {
-    type: 'button', role: 'menuitem', key: item.id, disabled: item.disabled, 'data-dwe-action': item.id,
-    onClick: () => invoke(item.id),
-  }, item.icon, item.label))), document.body);
-}
-
-export function DeleteDialog({ entries, close, remove }) {
-  const root = useRef(null);
-  const [working, setWorking] = useState(false);
-  const [error, setError] = useState('');
-  useLayoutEffect(() => {
-    const dialog = root.current;
-    dialog.showModal();
-    return () => dialog.close();
-  }, []);
-
-  return h('dialog', {
-    ref: root, className: 'dwe-file-dialog', 'aria-label': '删除项目',
-    onKeyDown: event => event.stopPropagation(),
-    onCancel: event => { event.preventDefault(); if (!working) close(); },
-  }, h('form', {
-    onSubmit: async event => {
-      event.preventDefault();
-      if (working) return;
-      setWorking(true);
-      setError('');
-      try { await remove(); }
-      catch (error) { setError(error.message); setWorking(false); }
-    },
-  },
-  h('h2', null, entries.length === 1 ? '移入回收站？' : '将这 ' + entries.length + ' 项移入回收站？'),
-  entries.length === 1
-    ? h('div', { className: 'dwe-delete-path', title: entries[0].absolute }, entries[0].absolute)
-    : h('ul', { className: 'dwe-delete-path dwe-delete-paths' },
-      ...entries.map(entry => h('li', { key: entry.absolute, title: entry.absolute }, entry.absolute))),
-  error && h('p', { role: 'alert' }, error),
-  h('div', { className: 'dwe-dialog-actions' },
-    h('button', { type: 'button', autoFocus: true, onClick: close, disabled: working }, '取消'),
-    h('button', {
-      type: 'submit', 'data-dwe-action': 'delete', disabled: working,
-    }, working ? '正在移入…' : '移入回收站'))));
-}
-
-export function RenameDialog({ entry, close, rename }) {
-  const root = useRef(null);
-  const input = useRef(null);
-  const [name, setName] = useState(entry.name);
-  const [saving, setSaving] = useState(false);
-  const [error, setError] = useState('');
-  useLayoutEffect(() => {
-    const dialog = root.current;
-    dialog.showModal();
-    const dot = entry.type === 'file' ? entry.name.lastIndexOf('.') : -1;
-    input.current.setSelectionRange(0, dot > 0 ? dot : entry.name.length);
-    return () => dialog.close();
-  }, [entry]);
-
-  return h('dialog', {
-    ref: root, className: 'dwe-file-dialog', 'aria-label': '重命名',
-    onKeyDown: event => event.stopPropagation(),
-    onCancel: event => { event.preventDefault(); if (!saving) close(); },
-  }, h('form', {
-    onSubmit: async event => {
-      event.preventDefault();
-      if (saving || !name.trim()) return;
-      setSaving(true);
-      setError('');
-      try { await rename(name); }
-      catch (error) { setError(error.message); setSaving(false); }
-    },
-  },
-  h('h2', null, '重命名'),
-  h('label', null, '新名称', h('input', {
-    ref: input, value: name, autoFocus: true, spellCheck: false, readOnly: saving,
-    onChange: event => { setName(event.target.value); setError(''); },
-  })),
-  error && h('p', { role: 'alert' }, error),
-  h('div', { className: 'dwe-dialog-actions' },
-    h('button', { type: 'button', onClick: close, disabled: saving }, '取消'),
-    h('button', { type: 'submit', disabled: saving || !name.trim() }, saving ? '正在重命名…' : '确定'))));
+const { createElement: h, useEffect, useLayoutEffect, useRef, useState } = react;
+
+export function FileMenu({ menu, items, close, invoke }) {
+  const root = useRef(null);
+  useLayoutEffect(() => {
+    const node = root.current;
+    const bounds = node.getBoundingClientRect();
+    node.style.left = Math.max(4, Math.min(menu.x, window.innerWidth - bounds.width - 4)) + 'px';
+    node.style.top = Math.max(4, Math.min(menu.y, window.innerHeight - bounds.height - 4)) + 'px';
+    node.querySelector('button:not(:disabled)')?.focus({ preventScroll: true });
+  }, [menu]);
+
+  useEffect(() => {
+    const controller = new AbortController();
+    const options = { capture: true, signal: controller.signal };
+    function outside(event) {
+      if (!root.current?.contains(event.target)) close();
+    }
+    document.addEventListener('pointerdown', outside, options);
+    document.addEventListener('wheel', outside, options);
+    window.addEventListener('resize', close, options);
+    return () => controller.abort();
+  }, [close]);
+
+  return reactDom.createPortal(h('div', {
+    ref: root, className: 'dwe-file-menu', role: 'menu', 'aria-label': '文件操作',
+    onContextMenu: event => event.preventDefault(),
+    onKeyDown: event => {
+      if (event.key === 'Escape') {
+        event.preventDefault();
+        event.stopPropagation();
+        close(true);
+        return;
+      }
+      const keys = ['ArrowDown', 'ArrowUp', 'Home', 'End'];
+      if (!keys.includes(event.key)) return;
+      const buttons = [...root.current.querySelectorAll('button:not(:disabled)')];
+      if (!buttons.length) return;
+      const current = buttons.indexOf(document.activeElement);
+      const next = event.key === 'Home' ? 0 : event.key === 'End' ? buttons.length - 1
+        : (current + (event.key === 'ArrowDown' ? 1 : -1) + buttons.length) % buttons.length;
+      buttons[next].focus({ preventScroll: true });
+      event.preventDefault();
+      event.stopPropagation();
+    },
+  }, ...items.map(item => h('button', {
+    type: 'button', role: 'menuitem', key: item.id, disabled: item.disabled, 'data-dwe-action': item.id,
+    onClick: () => invoke(item.id),
+  }, item.icon, item.label))), document.body);
+}
+
+export function DeleteDialog({ entries, close, remove }) {
+  const root = useRef(null);
+  const [working, setWorking] = useState(false);
+  const [error, setError] = useState('');
+  useLayoutEffect(() => {
+    const dialog = root.current;
+    dialog.showModal();
+    return () => dialog.close();
+  }, []);
+
+  return h('dialog', {
+    ref: root, className: 'dwe-file-dialog', 'aria-label': '删除项目',
+    onKeyDown: event => event.stopPropagation(),
+    onCancel: event => { event.preventDefault(); if (!working) close(); },
+  }, h('form', {
+    onSubmit: async event => {
+      event.preventDefault();
+      if (working) return;
+      setWorking(true);
+      setError('');
+      try { await remove(); }
+      catch (error) { setError(error.message); setWorking(false); }
+    },
+  },
+  h('h2', null, entries.length === 1 ? '移入回收站？' : '将这 ' + entries.length + ' 项移入回收站？'),
+  entries.length === 1
+    ? h('div', { className: 'dwe-delete-path', title: entries[0].absolute }, entries[0].absolute)
+    : h('ul', { className: 'dwe-delete-path dwe-delete-paths' },
+      ...entries.map(entry => h('li', { key: entry.absolute, title: entry.absolute }, entry.absolute))),
+  error && h('p', { role: 'alert' }, error),
+  h('div', { className: 'dwe-dialog-actions' },
+    h('button', { type: 'button', autoFocus: true, onClick: close, disabled: working }, '取消'),
+    h('button', {
+      type: 'submit', 'data-dwe-action': 'delete', disabled: working,
+    }, working ? '正在移入…' : '移入回收站'))));
+}
+
+export function RenameDialog({ entry, close, rename }) {
+  const root = useRef(null);
+  const input = useRef(null);
+  const [name, setName] = useState(entry.name);
+  const [saving, setSaving] = useState(false);
+  const [error, setError] = useState('');
+  useLayoutEffect(() => {
+    const dialog = root.current;
+    dialog.showModal();
+    const dot = entry.type === 'file' ? entry.name.lastIndexOf('.') : -1;
+    input.current.setSelectionRange(0, dot > 0 ? dot : entry.name.length);
+    return () => dialog.close();
+  }, [entry]);
+
+  return h('dialog', {
+    ref: root, className: 'dwe-file-dialog', 'aria-label': '重命名',
+    onKeyDown: event => event.stopPropagation(),
+    onCancel: event => { event.preventDefault(); if (!saving) close(); },
+  }, h('form', {
+    onSubmit: async event => {
+      event.preventDefault();
+      if (saving || !name.trim()) return;
+      setSaving(true);
+      setError('');
+      try { await rename(name); }
+      catch (error) { setError(error.message); setSaving(false); }
+    },
+  },
+  h('h2', null, '重命名'),
+  h('label', null, '新名称', h('input', {
+    ref: input, value: name, autoFocus: true, spellCheck: false, readOnly: saving,
+    onChange: event => { setName(event.target.value); setError(''); },
+  })),
+  error && h('p', { role: 'alert' }, error),
+  h('div', { className: 'dwe-dialog-actions' },
+    h('button', { type: 'button', onClick: close, disabled: saving }, '取消'),
+    h('button', { type: 'submit', disabled: saving || !name.trim() }, saving ? '正在重命名…' : '确定'))));
 }

package/src/ui/horizontal-wheel.js

@@ -1,12 +1,12 @@
-export function scrollHorizontally(event, element) {
-  if (event.ctrlKey || !event.deltaY || Math.abs(event.deltaX) >= Math.abs(event.deltaY)) return;
-  const max = element.scrollWidth - element.clientWidth;
-  if (max <= 1) return;
-  const unit = event.deltaMode === 1 ? 16 : event.deltaMode === 2 ? element.clientWidth : 1;
-  const distance = Math.sign(event.deltaY) * Math.min(36, Math.abs(event.deltaY) * unit * 0.55);
-  const position = element.scrollLeft;
-  if (distance < 0 ? position <= 0 : position >= max - 1) return;
-  event.preventDefault();
-  event.stopPropagation();
-  element.scrollTo({ left: position + distance, behavior: 'instant' });
+export function scrollHorizontally(event, element) {
+  if (event.ctrlKey || !event.deltaY || Math.abs(event.deltaX) >= Math.abs(event.deltaY)) return;
+  const max = element.scrollWidth - element.clientWidth;
+  if (max <= 1) return;
+  const unit = event.deltaMode === 1 ? 16 : event.deltaMode === 2 ? element.clientWidth : 1;
+  const distance = Math.sign(event.deltaY) * Math.min(36, Math.abs(event.deltaY) * unit * 0.55);
+  const position = element.scrollLeft;
+  if (distance < 0 ? position <= 0 : position >= max - 1) return;
+  event.preventDefault();
+  event.stopPropagation();
+  element.scrollTo({ left: position + distance, behavior: 'instant' });
 }

package/src/ui/navigation.js

@@ -39,3 +39,12 @@ export function resourceAddress(path, sessionId) {
   const encoded = path.split('\\').map(segment => encodeURIComponent(segment).replace(/%3A/gi, ':')).join('/');
   return 'dsh-resource://file/' + (sessionId ? 'session/' + encodeURIComponent(sessionId) : 'absolute') + '/' + encoded;
 }
+
+export function sessionFilePath(address, sessionId) {
+  const match = /^dsh-resource:\/\/file\/session\/([^/?#]+)\/([^?#]+)(?:[?#].*)?$/.exec(address);
+  if (!match || !sessionId) return null;
+  try {
+    if (decodeURIComponent(match[1]) !== sessionId) return null;
+    return match[2].split('/').map(decodeURIComponent).join('/');
+  } catch { return null; }
+}