feat: add browser upload queue and trusted sessions with bounded projections
This commit is contained in:
1 parent
84d52390f9
commit
b90aef79d0
79 files changed
+1962
-196
No files matched your search
@@ -0,0 +1,24 @@
|
||||
(() => {
|
||||
'use strict';
|
||||
const choice=document.getElementById('auth-remember');
|
||||
if(!choice)return;
|
||||
const sync=()=>{
|
||||
for(const form of document.querySelectorAll('.auth-form')){
|
||||
if(form===choice.form)continue;
|
||||
const path=new URL(form.action,location.href).pathname;
|
||||
if(!['/_/auth/ldap','/_/auth/magic-link'].includes(path))continue;
|
||||
let input=form.querySelector('input[name=remember]');
|
||||
if(!input){input=document.createElement('input');input.type='hidden';input.name='remember';form.append(input);}
|
||||
input.value=choice.checked?'1':'0';
|
||||
}
|
||||
for(const link of document.querySelectorAll('a.auth-provider-button')){
|
||||
const url=new URL(link.href,location.href);
|
||||
if(url.origin!==location.origin||url.pathname!=='/_/auth/oidc')continue;
|
||||
if(choice.checked)url.searchParams.set('remember','1');else url.searchParams.delete('remember');
|
||||
link.href=url.pathname+url.search;
|
||||
}
|
||||
};
|
||||
choice.addEventListener('change',sync);
|
||||
window.addEventListener('pageshow',sync);
|
||||
sync();
|
||||
})();
|
||||
@@ -56,15 +56,17 @@
|
||||
drain();
|
||||
}, {rootMargin: '240px 0px'});
|
||||
|
||||
document.querySelectorAll('.browser-thumbnail [data-preview-src]').forEach(image => {
|
||||
const observeImages = () => { document.querySelectorAll('.browser-thumbnail [data-preview-src]').forEach(image => {
|
||||
if(image.dataset.previewQueued || image.dataset.previewLoaded)return;
|
||||
observer.observe(image);
|
||||
const rect = image.getBoundingClientRect();
|
||||
if (rect.bottom >= -240 && rect.top <= innerHeight + 240) {
|
||||
observer.unobserve(image);
|
||||
enqueue(image);
|
||||
}
|
||||
});
|
||||
drain();
|
||||
});drain(); };
|
||||
observeImages();
|
||||
document.addEventListener('pageswiki:browser-list-updated',observeImages);
|
||||
document.addEventListener('visibilitychange', drain);
|
||||
window.addEventListener('pagehide', () => {
|
||||
stopped = true;
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
(() => {
|
||||
'use strict';
|
||||
const main=document.querySelector('[data-upload-directory]');if(!main)return;
|
||||
const ja=document.documentElement.lang.startsWith('ja'),t=(en,jp)=>ja?jp:en;
|
||||
const maxFiles=100,maxBytes=256*1024*1024,queue=[];
|
||||
let running=false,dragDepth=0,dirty=false,refreshGeneration=0;
|
||||
const el=(tag,text,cls)=>{const n=document.createElement(tag);if(text!==undefined)n.textContent=text;if(cls)n.className=cls;return n;};
|
||||
const button=(text,label,action)=>{const b=el('button',text);b.type='button';b.title=b.ariaLabel=label;b.onclick=action;return b;};
|
||||
const card=el('aside',undefined,'browser-upload-queue');card.hidden=true;card.ariaLabel=t('Uploads','アップロード');
|
||||
const header=el('header'),title=el('strong',t('Uploads','アップロード')),summary=el('span'),list=el('ol'),notice=el('p',undefined,'upload-notice'),footer=el('footer');
|
||||
notice.role='status';summary.setAttribute('aria-live','polite');list.id='browser-upload-items';
|
||||
const toggle=button('−',t('Collapse queue','キューを折りたたむ'),()=>{list.hidden=!list.hidden;toggle.textContent=list.hidden?'+':'−';toggle.setAttribute('aria-expanded',String(!list.hidden));});toggle.setAttribute('aria-expanded','true');toggle.setAttribute('aria-controls',list.id);
|
||||
const clear=button('✓',t('Clear finished entries','完了・失敗を一覧から除く'),()=>{for(let i=queue.length-1;i>=0;i--)if(queue[i].state!=='queued'&&queue[i].state!=='uploading'){queue[i].row.remove();queue.splice(i,1);}update();});
|
||||
const refresh=button('⟳',t('Refresh file list','ファイル一覧を更新'),()=>{if(!running)refreshList();});
|
||||
const close=button('×',t('Close queue','キューを閉じる'),()=>{if(!running)card.hidden=true;});
|
||||
header.append(title,summary,toggle,close);footer.append(clear,refresh);card.append(header,notice,list,footer);document.body.append(card);
|
||||
const labels={queued:t('Queued','待機'),uploading:t('Uploading','送信中'),done:t('Complete','完了'),failed:t('Failed','失敗'),cancelled:t('Cancelled','取消')};
|
||||
function update(){
|
||||
const completed=queue.filter(x=>x.state==='done').length,pending=queue.filter(x=>x.state==='queued'||x.state==='uploading').length;
|
||||
summary.textContent=`${completed} / ${queue.length}`;summary.title=t('Completed / total','完了 / 全件');
|
||||
close.disabled=refresh.disabled=running||pending>0;refresh.hidden=!dirty;
|
||||
clear.disabled=!queue.some(x=>!['queued','uploading'].includes(x.state));
|
||||
}
|
||||
function state(item,value,message){item.state=value;item.row.dataset.state=value;item.status.textContent=message||labels[value];item.cancel.disabled=value!=='queued';if(value==='done')item.progress.value=100;update();}
|
||||
function send(item){return new Promise(resolve=>{
|
||||
const xhr=new XMLHttpRequest();let settled=false;
|
||||
const finish=(ok,message)=>{if(settled)return;settled=true;item.file=null;dirty=true;state(item,ok?'done':'failed',message);resolve();};
|
||||
xhr.open('POST','/v/upload');xhr.timeout=10*60*1000;xhr.setRequestHeader('Accept','application/json');xhr.setRequestHeader('If-None-Match','*');
|
||||
xhr.upload.onprogress=e=>{if(e.lengthComputable){item.progress.value=Math.min(99,e.loaded/e.total*100);item.progress.setAttribute('aria-valuetext',`${Math.round(item.progress.value)}%`);}};
|
||||
xhr.onload=()=>{let result;try{result=JSON.parse(xhr.responseText);}catch{}
|
||||
if(xhr.status===201&&result?.path)finish(true);
|
||||
else finish(false,xhr.status===412?t('Already exists — not overwritten','同名あり・上書きしません'):xhr.status===401||xhr.status===403||xhr.responseURL.includes('/_/auth/')?t('Sign in / permission required','ログインまたは権限が必要'):t('Upload failed; check file list','送信失敗・一覧を確認してください'));
|
||||
};
|
||||
xhr.onerror=xhr.ontimeout=()=>finish(false,t('Connection lost; check result before retrying','通信断・再送前に保存結果を確認してください'));
|
||||
const form=new FormData();form.append('path',item.path);form.append('file',item.file,item.name);
|
||||
try{xhr.send(form);}catch{finish(false,t('Could not send file','ファイルを送信できません'));}
|
||||
});}
|
||||
async function refreshList(){
|
||||
const generation=++refreshGeneration;
|
||||
refresh.disabled=true;
|
||||
try{
|
||||
const response=await fetch(location.href,{credentials:'same-origin',cache:'no-store'});
|
||||
if(!response.ok||response.redirected)throw Error('refresh');
|
||||
const page=new DOMParser().parseFromString(await response.text(),'text/html'),grid=page.getElementById('browser-grid'),current=document.getElementById('browser-grid');
|
||||
if(generation!==refreshGeneration)return;
|
||||
if(!grid||page.querySelector('[data-upload-directory]')?.dataset.uploadDirectory!==main.dataset.uploadDirectory)throw Error('refresh');
|
||||
window.clearBrowserSelection?.();current.replaceChildren(...Array.from(grid.children).map(row=>document.importNode(row,true)));
|
||||
main.querySelector('.browser-empty')?.remove();const empty=page.querySelector('.browser-empty');if(empty)current.before(document.importNode(empty,true));
|
||||
document.dispatchEvent(new Event('pageswiki:browser-list-updated'));
|
||||
}catch{if(generation===refreshGeneration)notice.textContent=t('Could not refresh list. Reload after checking the queue.','一覧を更新できません。キューを確認してから再読み込みしてください。');}
|
||||
finally{update();}
|
||||
}
|
||||
async function pump(){if(running)return;running=true;update();try{let item;while((item=queue.find(x=>x.state==='queued'))){state(item,'uploading');await send(item);}}finally{running=false;update();if(dirty)refreshList();}}
|
||||
function add(files,directory){
|
||||
++refreshGeneration;
|
||||
card.hidden=false;notice.textContent='';
|
||||
for(const file of files){
|
||||
if(queue.length>=maxFiles){notice.textContent=t('Queue limit: 100 files. Clear finished entries.','キューは100件までです。完了分を一覧から除いてください。');break;}
|
||||
const name=file.name,target=directory.replace(/\/+$/,'')+'/'+name;
|
||||
if(!name||name==='.'||name==='..'||/[\\/\x00-\x1f]/.test(name)){notice.textContent=t('Invalid file name','無効なファイル名です');continue;}
|
||||
const row=el('li'),label=el('span',name,'upload-name'),status=el('span',labels.queued,'upload-state'),progress=el('progress');row.dataset.state='queued';progress.max=100;progress.value=0;progress.ariaLabel=name;label.title=target;
|
||||
const item={file,name,path:target,state:'queued',row,status,progress};item.cancel=button('×',t('Cancel queued file','待機中のファイルを取り消す'),()=>{if(item.state==='queued'){item.file=null;state(item,'cancelled');}});
|
||||
row.append(label,item.cancel,status,progress);list.append(row);queue.push(item);
|
||||
if(file.size>maxBytes){item.file=null;state(item,'failed',t('Maximum 256 MiB per file','1ファイル256 MiBまで'));}
|
||||
else if(queue.some(x=>x!==item&&x.path===target&&['queued','uploading'].includes(x.state))){item.file=null;state(item,'failed',t('Already queued','すでにキューにあります'));}
|
||||
}
|
||||
update();pump();
|
||||
}
|
||||
const external=e=>Array.from(e.dataTransfer?.types||[]).includes('Files');
|
||||
document.addEventListener('dragenter',e=>{if(!external(e))return;e.preventDefault();if(++dragDepth===1)main.classList.add('browser-upload-target');},true);
|
||||
document.addEventListener('dragover',e=>{if(!external(e))return;e.preventDefault();e.stopImmediatePropagation();e.dataTransfer.dropEffect=e.target.closest?.('.browser-main')?'copy':'none';},true);
|
||||
document.addEventListener('dragleave',e=>{if(!external(e))return;if(--dragDepth<=0){dragDepth=0;main.classList.remove('browser-upload-target');}},true);
|
||||
document.addEventListener('drop',e=>{
|
||||
if(!external(e))return;e.preventDefault();e.stopImmediatePropagation();dragDepth=0;main.classList.remove('browser-upload-target');
|
||||
if(!e.target.closest?.('.browser-main'))return;
|
||||
// Folder traversal is deliberately not guessed from zero-byte File objects.
|
||||
const items=Array.from(e.dataTransfer.items||[]);if(items.some(x=>x.webkitGetAsEntry?.()?.isDirectory)){card.hidden=false;notice.textContent=t('Drop files, not folders','フォルダではなくファイルをドロップしてください');return;}
|
||||
const folder=e.target.closest?.('.browser-row[data-is-dir="true"]');
|
||||
add(Array.from(e.dataTransfer.files||[]),folder?.dataset.path||main.dataset.uploadDirectory||'/');
|
||||
},true);
|
||||
addEventListener('beforeunload',e=>{if(running||queue.some(x=>x.state==='queued')){e.preventDefault();e.returnValue='';}});
|
||||
})();
|
||||
+42
-7
@@ -3,12 +3,23 @@ const api = '/_/api/v1/extension/organizer.feeds/browser/';
|
||||
const status = document.getElementById('status'), canvas = document.getElementById('screen');
|
||||
let engine, started = false, ready = false, stopped = false, navigating = false, poll, resizeTimer;
|
||||
let history = [], position = 0;
|
||||
const startup = new AbortController();
|
||||
let deadline, finding=false;
|
||||
const ja = parent.document.documentElement.lang.startsWith('ja');
|
||||
const text = (en,jp) => ja ? jp : en;
|
||||
function report(message) { status.textContent=message; status.hidden=!message; }
|
||||
function url(value) { try { const u=new URL(value); return ['https:','http:'].includes(u.protocol)&&!u.username&&!u.password&&u.href.length<=8192 ? u.href : ''; } catch {return '';} }
|
||||
function send(data) { parent.postMessage({type:'pageswiki-gecko',...data},location.origin); }
|
||||
function navigationState() { send({href:history[position],back:position>0,forward:position<history.length-1}); }
|
||||
async function pageState() {
|
||||
const uri=String(await engine.evalChrome('String(document.documentURI)'));
|
||||
const failed=/^about:(neterror|certerror)(?:\?|$)/.test(uri);
|
||||
// The minimal upstream GRE omits error-page localization/modules. Never
|
||||
// expose a broken certificate override UI; use our own inert explanation.
|
||||
canvas.hidden=failed;
|
||||
report(failed?text('The page could not be loaded securely or the connection failed. Certificate errors cannot be bypassed here. Use ↗ to inspect it in your browser.','安全な接続を確立できないか、通信に失敗しました。証明書エラーはここでは無視できません。↗からブラウザで確認してください。'):'');
|
||||
return !failed;
|
||||
}
|
||||
async function navigate(command) {
|
||||
if(!ready||stopped||navigating)return;
|
||||
const next=position+(command==='back'?-1:command==='forward'?1:0);
|
||||
@@ -18,37 +29,61 @@ async function navigate(command) {
|
||||
// Minimal upstream GRE omits SessionStoreFunctions: native history.back()
|
||||
// fails. Keep a bounded viewer-local URL history and re-load the chosen URL.
|
||||
await engine.load(history[position]);
|
||||
await pageState();
|
||||
const current=url(await engine.evalChrome('String(location.href)'));
|
||||
if(current)history[position]=current;
|
||||
navigationState();
|
||||
} catch { report(text('Navigation failed. Use ↗ to open the original.','移動できませんでした。↗から原文を開いてください。')); }
|
||||
finally {navigating=false;}
|
||||
}
|
||||
function stop() { stopped=true;clearTimeout(poll);clearTimeout(resizeTimer);engine?.destroy(); }
|
||||
function stop() { stopped=true;ready=false;startup.abort();clearTimeout(deadline);clearTimeout(poll);clearTimeout(resizeTimer);engine?.destroy(); }
|
||||
function fail() {
|
||||
if(stopped)return;
|
||||
stop();
|
||||
// Upstream destroy() only detaches input; the parent must discard the iframe
|
||||
// to release the WASM heap, workers and socket, including a stuck init().
|
||||
send({failed:true});
|
||||
}
|
||||
async function find(query, backwards) {
|
||||
if(!ready||stopped||finding||navigating||typeof query!=='string'||!query.trim()||query.length>256)return;
|
||||
finding=true;
|
||||
try {
|
||||
const found=await engine.evalChrome(`String(window.find(${JSON.stringify(query)},false,${backwards===true},true,false,false,false))`);
|
||||
if(!stopped)send({findResult:found==='true',query});
|
||||
} catch {if(!stopped)send({findError:true});}
|
||||
finally {finding=false;}
|
||||
}
|
||||
async function start(href) {
|
||||
started=true;
|
||||
if(!crossOriginIsolated || typeof SharedArrayBuffer==='undefined') { report(text('This browser cannot run the isolated viewer. Use ↗ to open the original.','このブラウザでは分離ビューアを実行できません。↗から原文を開いてください。'));return; }
|
||||
if(!crossOriginIsolated || typeof SharedArrayBuffer==='undefined') {fail();return;}
|
||||
report(text('Starting Gecko…','Geckoを起動中…'));
|
||||
const timer=setTimeout(()=>{if(!ready&&!stopped)report(text('Startup is taking longer than expected. Close the viewer to stop, or use ↗.','起動に時間がかかっています。閉じると停止します。↗から原文も開けます。'));},45000);
|
||||
deadline=setTimeout(fail,120000);
|
||||
try {
|
||||
const {Gecko}=await import(api+'assets/v0.0.1/gecko.js'); if(stopped)return;
|
||||
const font=await fetch(api+'distribution/v0.0.1/NotoSansCJKjp-Regular.otf',{credentials:'same-origin',signal:startup.signal});
|
||||
if(!font.ok)throw Error('Bundled font unavailable');
|
||||
const data=new Uint8Array(await font.arrayBuffer());if(stopped)return;
|
||||
if(data.byteLength!==16467736)throw Error('Bundled font size mismatch');
|
||||
const profile=memoryProfile();await profile.mkdir('fonts');await profile.writeFile('fonts/NotoSansCJKjp-Regular.otf',data);
|
||||
const socket=new URL(api+'wisp/',location.href);socket.protocol=location.protocol==='https:'?'wss:':'ws:';
|
||||
engine=new Gecko({canvas,wasm:{url:api+'assets/v0.0.1/gecko.wasm.zst',compressed:true},wispUrl:socket.href,profile:memoryProfile(),width:Math.min(innerWidth,1920),height:Math.min(innerHeight,1080),env:{GECKO_NOWASMJIT:'1'},print:()=>{},printErr:()=>{}});
|
||||
engine=new Gecko({canvas,wasm:{url:api+'assets/v0.0.1/gecko.wasm.zst',compressed:true},wispUrl:socket.href,profile,width:Math.min(innerWidth,1920),height:Math.min(innerHeight,1080),env:{GECKO_NOWASMJIT:'1'},print:()=>{},printErr:()=>{}});
|
||||
await engine.init();if(stopped)return;
|
||||
await engine.load(href);if(stopped)return;
|
||||
history=[url(await engine.evalChrome('String(location.href)'))||href];position=0;
|
||||
ready=true;report('');canvas.focus();send({ready:true});
|
||||
ready=true;clearTimeout(deadline);await pageState();canvas.focus();send({ready:true});
|
||||
navigationState();
|
||||
const update=async()=>{if(stopped)return;try{if(!navigating){const href=url(await engine.evalChrome('String(location.href)'));if(href&&!navigating&&href!==history[position]){history=history.slice(0,position+1);history.push(href);if(history.length>64)history.shift();position=history.length-1;navigationState();}}}catch{/* Keep the last validated URL. */}if(!stopped)poll=setTimeout(update,2000);};update();
|
||||
} catch { report(text('Viewer failed. Close it and retry, or use ↗ to open the original.','ビューアを開始できませんでした。閉じて再試行するか、↗から原文を開いてください。')); }
|
||||
const update=async()=>{if(stopped)return;try{if(!navigating){await pageState();const href=url(await engine.evalChrome('String(location.href)'));if(href&&!navigating&&href!==history[position]){history=history.slice(0,position+1);history.push(href);if(history.length>64)history.shift();position=history.length-1;navigationState();}}}catch{/* Keep the last validated URL. */}if(!stopped)poll=setTimeout(update,2000);};update();
|
||||
} catch {fail();}
|
||||
finally {clearTimeout(timer);}
|
||||
}
|
||||
addEventListener('message',event=>{
|
||||
if(event.source!==parent||event.origin!==location.origin||event.data?.type!=='pageswiki-gecko')return;
|
||||
if(!started){const href=url(event.data.href);if(href)start(href);return;}
|
||||
if(['back','forward','reload'].includes(event.data.command))navigate(event.data.command);
|
||||
if(event.data.command==='find')find(event.data.query,event.data.backwards);
|
||||
});
|
||||
addEventListener('resize',()=>{clearTimeout(resizeTimer);resizeTimer=setTimeout(()=>{if(ready&&!stopped)engine.resize(Math.min(innerWidth,1920),Math.min(innerHeight,1080)).catch(()=>{});},150);});
|
||||
addEventListener('keydown',e=>{if(e.key==='Escape'){e.preventDefault();send({close:true});}},true);
|
||||
addEventListener('keydown',e=>{if(e.key==='Escape'){e.preventDefault();send({close:true});}if((e.ctrlKey||e.metaKey)&&e.key.toLowerCase()==='f'){e.preventDefault();e.stopImmediatePropagation();send({find:true});}},true);
|
||||
addEventListener('pagehide',stop);
|
||||
send({listening:true});
|
||||
+54
-16
@@ -28,12 +28,14 @@
|
||||
const transfer=button('⇄','OPML',opmlForm);transfer.id='feed-opml';toolbar.append(transfer);
|
||||
const history=button('◷',t('Operation history','操作履歴'),actionHistory);history.id='feed-history';toolbar.append(history);
|
||||
const helpButton=button('?',t('Keyboard shortcuts','キー操作'),showHelp),help=el('div',undefined,'feed-help');help.id='feed-help';help.hidden=true;helpButton.setAttribute('aria-controls',help.id);helpButton.setAttribute('aria-expanded','false');
|
||||
help.append(el('span',t('j/k articles · Shift+j/k folders · Enter read · Esc index · / search · n unread · m read/unread · * star · r refresh · ? / Esc close help','j/k 記事移動 · Shift+j/k フォルダ移動 · Enter 本文 · Esc 一覧 · / 検索 · n 次の未読 · m 既読/未読 · * star · r 更新 · ? / Esc ヘルプを閉じる')),button('×',t('Close help','ヘルプを閉じる'),hideHelp));status.before(help);toolbar.append(helpButton);
|
||||
help.append(el('span',t('j/k articles · Shift+j/k folders / subscriptions · Shift+h parent · Shift+l enter · Enter read · Esc index · / search · n unread · m read/unread · * star · r refresh · ? / Esc close help','j/k 記事移動 · Shift+j/k フォルダ・購読元移動 · Shift+h 親へ · Shift+l 配下へ · Enter 本文 · Esc 一覧 · / 検索 · n 次の未読 · m 既読/未読 · * star · r 更新 · ? / Esc ヘルプを閉じる')),button('×',t('Close help','ヘルプを閉じる'),hideHelp));status.before(help);toolbar.append(helpButton);
|
||||
let debounce;searchbox.addEventListener('input',()=>{clearTimeout(debounce);debounce=setTimeout(()=>{search=searchbox.value.trim();load(false).catch(report);},180);});
|
||||
const columns=document.getElementById('feed-columns');for(const s of ['',t('Date','日付'),t('Feed','配信元'),t('Subject','件名')])columns.append(el('span',s));
|
||||
const columns=document.getElementById('feed-columns');for(const s of ['',t('Date','日付'),t('Time','時刻'),t('Feed','配信元'),t('Subject','件名')])columns.append(el('span',s));
|
||||
function hideHelp(){if(help.contains(document.activeElement))helpButton.focus();help.hidden=true;helpButton.setAttribute('aria-expanded','false');}
|
||||
function showHelp(){if(!help.hidden){hideHelp();return;}help.hidden=false;helpButton.setAttribute('aria-expanded','true');}
|
||||
function date(ms){return ms?new Intl.DateTimeFormat(ja?'ja-JP':'en-GB',{month:'2-digit',day:'2-digit'}).format(new Date(ms)):'—';}
|
||||
const dateOptions={timeZone:root.dataset.timezone||undefined},dateFormat=new Intl.DateTimeFormat(ja?'ja-JP':'en-GB',{...dateOptions,month:'2-digit',day:'2-digit'}),timeFormat=new Intl.DateTimeFormat(ja?'ja-JP':'en-GB',{...dateOptions,hour:'2-digit',minute:'2-digit',hourCycle:'h23'}),fullDateFormat=new Intl.DateTimeFormat(ja?'ja-JP':'en-GB',{...dateOptions,year:'numeric',month:'2-digit',day:'2-digit',hour:'2-digit',minute:'2-digit',second:'2-digit',hourCycle:'h23',timeZoneName:'short'});
|
||||
function validDate(ms){return typeof ms==='number'&&ms>0&&Number.isFinite(new Date(ms).getTime());}
|
||||
function date(ms){return validDate(ms)?dateFormat.format(new Date(ms)):'—';}
|
||||
function closeReader(){editing=false;detailSeq++;detailController?.abort();layout.classList.remove('reading','action-history');rows.focus();}
|
||||
function drawSources(){sourcesView.replaceChildren();const all=button(t('All sources','すべての購読元'),'',()=>chooseSource(''));sourcesView.append(all);let folder=null;
|
||||
for(const source of sources){if(folder!==source.folder){folder=source.folder;sourcesView.append(el('h3',folder||t('Sources','購読元')));}const row=el('div',undefined,'feed-source');row.setAttribute('aria-current',String(currentSource===source.uuid));
|
||||
@@ -54,16 +56,36 @@
|
||||
remoteCategory=id;categoryMode=mode;remoteFeed=feed;markCatalog();layout.classList.remove('sources-open','reading','action-history');
|
||||
detailSeq++;detailController?.abort();clearTimeout(actionTimer);selected=-1;editing=false;reader.replaceChildren();await load(false);
|
||||
}
|
||||
const sortedSubscriptions=subs=>[...subs].sort((a,b)=>a.title.localeCompare(b.title)||a.id.localeCompare(b.id));
|
||||
function moveFolder(delta){
|
||||
if(!catalogLoaded||sources.find(s=>s.uuid===currentSource)?.provider!=='freshrss')return;
|
||||
const groups=catalogGroups();if(!groups.length)return;
|
||||
const current=groups.findIndex(g=>g.id===remoteCategory&&g.mode===categoryMode);
|
||||
if(remoteFeed){const g=groups[current],subs=sortedSubscriptions(g?g.subs:catalog),index=subs.findIndex(s=>s.id===remoteFeed)+delta;if(index<0||index>=subs.length)return;return navigateCatalog(g?.id||'',g?.mode||'',subs[index].id);}
|
||||
const index=current<0?(delta>0?0:groups.length-1):current+delta;if(index<0||index>=groups.length)return;
|
||||
// Folder search must not leave the newly selected folder invisible.
|
||||
if(catalogSearch){catalogSearch='';drawSources();}
|
||||
const group=groups[index],result=chooseCatalog(group.id,group.mode);
|
||||
const selectedFolder=sourcesView.querySelector('.feed-folder-name[aria-current="true"]');
|
||||
selectedFolder?.scrollIntoView({block:'nearest'});rows.focus({preventScroll:true});return result;
|
||||
const group=groups[index];return navigateCatalog(group.id,group.mode);
|
||||
}
|
||||
function navigateCatalog(id,mode,feed=''){
|
||||
// Clear only the tree filter, never article search or unread/star filters.
|
||||
catalogSearch='';
|
||||
const result=chooseCatalog(id,mode,feed);drawSources();
|
||||
sourcesView.querySelector('.feed-catalog button[aria-current="true"]')?.scrollIntoView({block:'nearest'});rows.focus({preventScroll:true});return result;
|
||||
}
|
||||
function enterFolder(enter){
|
||||
if(!catalogLoaded||sources.find(s=>s.uuid===currentSource)?.provider!=='freshrss')return;
|
||||
const groups=catalogGroups(),group=groups.find(g=>g.id===remoteCategory&&g.mode===categoryMode),state=folderState(currentSource);
|
||||
if(enter){
|
||||
if(remoteFeed)return;
|
||||
if(!group){if(groups.length)return navigateCatalog(groups[0].id,groups[0].mode);return;}
|
||||
state.add(JSON.stringify([group.mode,group.id]));
|
||||
}else{
|
||||
if(remoteFeed)return navigateCatalog(group?.id||'',group?.mode||'');
|
||||
if(!group)return;
|
||||
state.delete(JSON.stringify([group.mode,group.id]));
|
||||
}
|
||||
try{localStorage.setItem('pageswiki.feed-folders.v1:'+currentSource,JSON.stringify([...state]));}catch{}
|
||||
if(!enter)return navigateCatalog('','');
|
||||
const sub=sortedSubscriptions(group.subs)[0];return navigateCatalog(group.id,group.mode,sub?.id||'');
|
||||
}
|
||||
function drawCatalog(parent){
|
||||
if(!catalogLoaded)return;
|
||||
@@ -74,8 +96,8 @@
|
||||
const all=select(t('All subscriptions','すべての購読'),{id:'',mode:''});all.className='feed-tree-all';nav.append(all);
|
||||
const find=el('input');find.type='search';find.placeholder=find.ariaLabel=t('Find subscription / folder','購読・フォルダを検索');find.value=catalogSearch;nav.append(find);
|
||||
const list=el('div',undefined,'feed-folders');nav.append(list);parent.append(nav);
|
||||
function subscriptions(target,subs,g){let count=0;const sorted=[...subs].sort((a,b)=>a.title.localeCompare(b.title)||a.id.localeCompare(b.id));const more=button('↓',t('More subscriptions','購読元をさらに表示'),append);
|
||||
function append(){more.remove();for(const sub of sorted.slice(count,count+50)){const group=g||{id:'',mode:''},b=select(sub.title||sub.id,group,sub.id);b.title=(sub.title||sub.id)+(sub.categories.length?' · '+sub.categories.map(c=>c.label).join(' / '):'');target.append(b);}count+=50;if(count<sorted.length)target.append(more);}append();
|
||||
function subscriptions(target,subs,g){const sorted=sortedSubscriptions(subs);let count=0;const more=button('↓',t('More subscriptions','購読元をさらに表示'),append);
|
||||
function append(){more.remove();const end=Math.max(count+50,sorted.findIndex(s=>s.id===remoteFeed)+1);for(const sub of sorted.slice(count,end)){const group=g||{id:'',mode:''},b=select(sub.title||sub.id,group,sub.id);b.title=(sub.title||sub.id)+(sub.categories.length?' · '+sub.categories.map(c=>c.label).join(' / '):'');target.append(b);}count=end;if(count<sorted.length)target.append(more);}append();
|
||||
}
|
||||
const draw=()=>{list.replaceChildren();const query=find.value.trim().toLocaleLowerCase();catalogSearch=find.value;
|
||||
if(query){const matches=catalog.filter(s=>s.title.toLocaleLowerCase().includes(query)||s.categories.some(c=>c.label.toLocaleLowerCase().includes(query)));const results=el('div',undefined,'feed-subscriptions');list.append(results);subscriptions(results,matches,null);if(!matches.length)results.append(el('small',t('No subscriptions','購読なし')));return;}
|
||||
@@ -92,7 +114,15 @@
|
||||
const data=await request('catalog?'+new URLSearchParams({source:currentSource}),{signal:catalogController.signal});if(version!==catalogSeq)return;catalog=data.subscriptions;catalogFolders=data.folders||[];catalogLoaded=true;drawSources();
|
||||
}
|
||||
async function chooseSource(id){currentSource=id;remoteFeed=remoteCategory=categoryMode=catalogSearch='';catalog=[];catalogFolders=[];catalogLoaded=false;drawSources();layout.classList.remove('reading');editing=false;await Promise.all([loadCatalog(),load(false)]);if(sources.find(s=>s.uuid===id)?.provider!=='freshrss')layout.classList.remove('sources-open');}
|
||||
function rowNode(item,index){const row=el('div',undefined,'feed-row'+(item.read?'':' unread'));row.id='feed-row-'+index;row.setAttribute('role','option');row.setAttribute('aria-selected',String(index===selected));for(const text of [(item.starred?'★':item.read?' ':'●'),date(item.published_ms),item.feed||sources.find(s=>s.uuid===item.source)?.title||'',item.title||t('(Untitled)','(無題)')])row.append(el('span',text));row.title=item.title;row.onclick=()=>open(index).catch(report);return row;}
|
||||
function rowNode(item,index){
|
||||
const row=el('div',undefined,'feed-row'+(item.read?'':' unread'));
|
||||
row.id='feed-row-'+index;row.setAttribute('role','option');row.setAttribute('aria-selected',String(index===selected));
|
||||
const known=validDate(item.published_ms),published=el('span',known?timeFormat.format(new Date(item.published_ms)):'—','feed-published-time');
|
||||
published.title=published.ariaLabel=t('Published: ','配信日時: ')+(known?fullDateFormat.format(new Date(item.published_ms)):t('Unknown','不明'));
|
||||
row.append(el('span',item.starred?'★':item.read?' ':'●'),el('span',date(item.published_ms)),published,
|
||||
el('span',item.feed||sources.find(s=>s.uuid===item.source)?.title||''),el('span',item.title||t('(Untitled)','(無題)')));
|
||||
row.title=item.title;row.onclick=()=>open(index).catch(report);return row;
|
||||
}
|
||||
function drawRows(){rows.replaceChildren(...items.map(rowNode));more.hidden=!next;more.textContent='↓';more.title=more.ariaLabel=t('More articles','続きを表示');if(!items.length)rows.append(el('p',t('No articles','記事なし'),'feed-warning'));}
|
||||
async function load(append){if(append&&(!next||loading))return;controller?.abort();controller=new AbortController();const version=++seq;loading=true;more.disabled=true;
|
||||
try{const q=new URLSearchParams({source:currentSource,filter,q:search,feed:remoteFeed,category:remoteCategory,category_mode:categoryMode});if(append){q.set('before',next.ms);q.set('key',next.key);}const data=await request('items?'+q,{signal:controller.signal});if(version!==seq)return;
|
||||
@@ -115,13 +145,21 @@
|
||||
const gecko=root.dataset.linkMode==='gecko', controller=new AbortController();
|
||||
const close=button('×',t('Close preview','プレビューを閉じる'),()=>dialog.close());bar.append(name,external,close);frame.title=dialog.ariaLabel;frame.referrerPolicy='no-referrer';
|
||||
if(gecko){
|
||||
const licenses=el('a','ⓘ');licenses.href=api+'browser/distribution/v0.0.1/index.html';licenses.target='_blank';licenses.rel='noopener noreferrer';licenses.title=licenses.ariaLabel=t('Engine sources and licenses','エンジンのソースとライセンス');bar.insertBefore(licenses,close);
|
||||
frame.src=api+'browser/';frame.allow='cross-origin-isolated';
|
||||
const send=command=>frame.contentWindow?.postMessage({type:'pageswiki-gecko',command},location.origin);
|
||||
const send=(command,options={})=>frame.contentWindow?.postMessage({type:'pageswiki-gecko',command,...options},location.origin);
|
||||
const findbar=el('form',undefined,'feed-gecko-find'),query=el('input'),findStatus=el('output');findbar.hidden=true;query.type='search';query.maxLength=256;query.placeholder=query.ariaLabel=t('Find in article','記事内を検索');findStatus.role='status';
|
||||
const findButton=button('⌕',t('Find in article (Ctrl+F)','記事内検索 (Ctrl+F)'),()=>{findbar.hidden=!findbar.hidden;if(!findbar.hidden)query.focus();});findButton.disabled=true;bar.insertBefore(findButton,name);
|
||||
const search=backwards=>{if(query.value.trim())send('find',{query:query.value,backwards});};
|
||||
findbar.append(query,button('↑',t('Previous match','前の一致'),()=>search(true)),button('↓',t('Next match','次の一致'),()=>search(false)),findStatus,button('×',t('Close search','検索を閉じる'),()=>{findbar.hidden=true;findButton.focus();}));
|
||||
findbar.onsubmit=e=>{e.preventDefault();search(false);};query.oninput=()=>findStatus.textContent='';query.addEventListener('keydown',e=>{if(e.key==='Escape'){e.preventDefault();findbar.hidden=true;findButton.focus();}else if(e.key==='Enter'&&e.shiftKey){e.preventDefault();search(true);}});
|
||||
dialog.addEventListener('keydown',e=>{if((e.ctrlKey||e.metaKey)&&e.key.toLowerCase()==='f'&&!findButton.disabled){e.preventDefault();findbar.hidden=false;query.focus();}});
|
||||
dialog.append(findbar);
|
||||
const nav={};for(const [icon,label,command]of [['←',t('Back','戻る'),'back'],['→',t('Forward','進む'),'forward'],['⟳',t('Reload','再読込'),'reload']]){const b=button(icon,label,()=>send(command));b.disabled=true;nav[command]=b;bar.insertBefore(b,name);}
|
||||
addEventListener('message',e=>{if(e.origin!==location.origin||e.source!==frame.contentWindow||e.data?.type!=='pageswiki-gecko')return;if(e.data.listening)frame.contentWindow.postMessage({type:'pageswiki-gecko',href:url.href},location.origin);if(e.data.close)dialog.close();if(e.data.ready)nav.reload.disabled=false;if(typeof e.data.back==='boolean')nav.back.disabled=!e.data.back;if(typeof e.data.forward==='boolean')nav.forward.disabled=!e.data.forward;if(e.data.href){try{const u=new URL(e.data.href);if(['http:','https:'].includes(u.protocol)&&!u.username&&!u.password){name.textContent=u.hostname;name.title=external.href=u.href;}}catch{}}},{signal:controller.signal});
|
||||
addEventListener('message',e=>{if(e.origin!==location.origin||e.source!==frame.contentWindow||e.data?.type!=='pageswiki-gecko')return;if(e.data.listening)frame.contentWindow.postMessage({type:'pageswiki-gecko',href:url.href},location.origin);if(e.data.close)dialog.close();if(e.data.ready)nav.reload.disabled=findButton.disabled=false;if(e.data.find&&!findButton.disabled){findbar.hidden=false;query.focus();}if(typeof e.data.findResult==='boolean'&&e.data.query===query.value)findStatus.textContent=e.data.findResult?'':t('No match','一致なし');if(e.data.findError)findStatus.textContent=t('Search unavailable','検索できません');if(e.data.failed){for(const b of Object.values(nav))b.disabled=true;findButton.disabled=true;findbar.hidden=true;const error=el('p',t('Viewer unavailable. Close and retry, or open the original with ↗.','ビューアを開始できません。閉じて再試行するか、↗から原文を開いてください。'),'feed-warning');error.role='alert';frame.src='about:blank';frame.replaceWith(error);return;}if(typeof e.data.back==='boolean')nav.back.disabled=!e.data.back;if(typeof e.data.forward==='boolean')nav.forward.disabled=!e.data.forward;if(e.data.href){try{const u=new URL(e.data.href);if(['http:','https:'].includes(u.protocol)&&!u.username&&!u.password){name.textContent=u.hostname;name.title=external.href=u.href;}}catch{}}},{signal:controller.signal});
|
||||
let hiddenTimer;document.addEventListener('visibilitychange',()=>{clearTimeout(hiddenTimer);if(document.hidden)hiddenTimer=setTimeout(()=>dialog.close(),60000);},{signal:controller.signal});dialog.addEventListener('close',()=>clearTimeout(hiddenTimer),{once:true});
|
||||
}else{frame.setAttribute('sandbox','allow-scripts');frame.src=url.href;}
|
||||
dialog.append(bar,frame);root.append(dialog);
|
||||
dialog.prepend(bar);dialog.append(frame);root.append(dialog);
|
||||
dialog.addEventListener('keydown',e=>e.stopPropagation());dialog.addEventListener('close',()=>{controller.abort();frame.src='about:blank';dialog.remove();editing=wasEditing;const item=items[selected];if(item&&!editing)pollAction(item);});dialog.showModal();close.focus();
|
||||
}
|
||||
function renderItem(item){reader.replaceChildren();const actions=el('div',undefined,'feed-actions');actions.append(button('←',t('Back to list','一覧へ戻る'),closeReader));
|
||||
@@ -133,7 +171,7 @@
|
||||
const original=actions.querySelector('.feed-original');if(original)original.addEventListener('click',e=>openArticleLink(e,original.href));
|
||||
if(item.url&&root.dataset.shareX==='true'){const share=el('a',undefined,'feed-share-x feed-original');share.title=share.ariaLabel=t('Share original article on X','原文の記事をXでシェア');share.href='https://twitter.com/intent/tweet?'+new URLSearchParams({text:item.title||'',url:item.url});share.target='_blank';share.rel='noopener noreferrer';const svg=document.createElementNS('http://www.w3.org/2000/svg','svg'),path=document.createElementNS(svg.namespaceURI,'path');svg.setAttribute('viewBox','0 0 24 24');svg.setAttribute('aria-hidden','true');path.setAttribute('d','M18 3h3l-7 8 8 10h-6l-5-7-6 7H2l7-9L2 3h6l5 6z');svg.append(path);share.append(svg);actions.append(share);}
|
||||
if(writable)actions.append(button(t('+ Wiki / Task','+ Wiki・タスク'),t('Capture with attribution','出典付きで取り込む'),()=>captureForm(item)));
|
||||
reader.append(actions,el('h1',item.title||t('(Untitled)','(無題)')),el('p',(item.feed||'')+' · '+(item.published_ms?new Date(item.published_ms).toLocaleString():t('Date unknown','日付不明')),'feed-meta'));
|
||||
reader.append(actions,el('h1',item.title||t('(Untitled)','(無題)')),el('p',(item.feed||'')+' · '+(validDate(item.published_ms)?fullDateFormat.format(new Date(item.published_ms)):t('Date unknown','日付不明')),'feed-meta'));
|
||||
if(item.provider==='freshrss'&&!canWrite)read.title=star.title=t('FreshRSS · read only','FreshRSS · 読取専用');
|
||||
const body=el('div',undefined,'feed-body');
|
||||
if(item.body_html){body.classList.add('feed-body-html');const shadow=body.attachShadow({mode:'open'}),style=el('style',':host{display:block;overflow-wrap:anywhere;line-height:1.6}p{margin:.6em 0}h1,h2,h3{line-height:1.3}a{color:var(--link,var(--accent,#659de4))}pre{white-space:pre-wrap;overflow-wrap:anywhere;padding:.5em;background:color-mix(in srgb,currentColor 5%,transparent)}blockquote{margin:.5em 0;padding-left:1em;border-left:3px solid var(--border,#8885)}table{border-collapse:collapse;max-width:100%;display:block;overflow:auto}th,td{padding:.3em .6em;border:1px solid var(--border,#8885)}');const content=el('div');content.innerHTML=item.body_html;shadow.append(style,content);}
|
||||
@@ -240,7 +278,7 @@
|
||||
};
|
||||
}
|
||||
document.addEventListener('keydown',event=>{if(event.defaultPrevented||event.isComposing||event.ctrlKey||event.altKey||event.metaKey||document.querySelector('dialog[open]'))return;if(event.key==='Escape'&&!help.hidden){hideHelp();event.preventDefault();return;}const input=event.target.closest?.('input,textarea,select,[contenteditable]:not([contenteditable=false]),[role=textbox]');if(input||event.target.isContentEditable){if(event.key==='Escape'){event.target.blur();event.preventDefault();}return;}if(event.key==='?'&&!help.hidden){hideHelp();event.preventDefault();return;}if(event.key==='Enter'&&event.target.closest?.('button,a'))return;if(editing){if(event.key==='Escape'){closeReader();event.preventDefault();}return;}
|
||||
if(event.shiftKey&&['j','k'].includes(event.key.toLowerCase())){event.preventDefault();Promise.resolve().then(()=>moveFolder(event.key.toLowerCase()==='j'?1:-1)).catch(report);return;}
|
||||
if(event.shiftKey&&['h','j','k','l'].includes(event.key.toLowerCase())){event.preventDefault();const key=event.key.toLowerCase();Promise.resolve().then(()=>key==='h'||key==='l'?enterFolder(key==='l'):moveFolder(key==='j'?1:-1)).catch(report);return;}
|
||||
let action;switch(event.key){case 'j':case 'ArrowDown':action=()=>open(Math.min(items.length-1,selected+1));break;case 'k':case 'ArrowUp':action=()=>open(Math.max(0,selected-1));break;case 'Enter':case 'l':action=()=>open(Math.max(0,selected));break;case 'Escape':case 'h':action=closeReader;break;case '/':action=()=>searchbox.focus();break;case 'r':if(writable)action=queueRefresh;break;case 'm':action=()=>setState(!items[selected]?.read,!!items[selected]?.starred);break;case '*':action=()=>setState(!!items[selected]?.read,!items[selected]?.starred);break;case 'n':action=()=>{const i=items.findIndex((x,i)=>i>selected&&!x.read);if(i>=0)return open(i);};break;case '?':action=showHelp;break;}if(action){event.preventDefault();Promise.resolve().then(action).catch(report);}
|
||||
});
|
||||
(async()=>{const q=new URLSearchParams(location.search);currentSource=q.get('source')||'';await reload();if(q.has('settings')&&writable){sourceForm();return;}if(q.has('id')&¤tSource){let index=items.findIndex(x=>x.source===currentSource&&x.id===q.get('id'));if(index<0){const data=await request('item?'+new URLSearchParams({source:currentSource,id:q.get('id')}));items.unshift(data.item);index=0;drawRows();}await open(index);}})().catch(report);
|
||||
|
||||
+6
-3
@@ -121,6 +121,7 @@
|
||||
}
|
||||
async function open(id,kind='task') {
|
||||
if($('dialog').open&&!closeDialog())return;
|
||||
$('page-open').hidden=true;$('page-open').removeAttribute('href');
|
||||
const ticket=++detailGeneration;dialogController?.abort();dialogController=new AbortController();$('error').textContent='';editing=null;dirty=false;$('fields').replaceChildren();Object.keys(fields).forEach(k=>delete fields[k]);$('history').open=false;$('history').querySelector('ol').replaceChildren();$('dialog-title').textContent=t('loading');$('save').disabled=true;$('archive').hidden=$('delete').hidden=true;$('history').hidden=true;$('project-open').hidden=true;$('dialog').showModal();
|
||||
try {
|
||||
if(!id&&kind==='task')await refreshDefaults();
|
||||
@@ -147,9 +148,11 @@
|
||||
}
|
||||
if(editing.kind==='project'){const folder=field('notes_subpath',t('notes_subpath'),'text',editing.notes_subpath||'tasks',true);folder.maxLength=500;folder.placeholder='tasks';$('fields').append(el('small',ja?'例:関連Wikiが /projects/app、サブ階層が tasks → /projects/app/tasks/件名。Wikiの公開範囲に従います。':'Example: project Wiki /projects/app + subfolder tasks → /projects/app/tasks/title. Wiki permissions apply.','task-full'));}
|
||||
field('page_path',t('page'),'text',data.page_path,true).placeholder='/lab/project';
|
||||
if(data.page_path){const a=el('a',t('linked')+' ↗');a.href='/'+data.page_path.replace(/^\/+/, '').split('/').map(encodeURIComponent).join('/');$('fields').append(a);}else if(editing.page_uuid)$('fields').append(el('small',t('hiddenLink')));
|
||||
if(editing.page_uuid){const unlink=el('button',t('unlink'));unlink.type='button';unlink.disabled=!writable;unlink.addEventListener('click',()=>{editing.page_uuid='';fields.page_path.value='';fields.page_path.dataset.changed='true';dirty=true;unlink.disabled=true;});$('fields').append(unlink);}
|
||||
fields.page_path.addEventListener('input',()=>{fields.page_path.dataset.changed='true';});
|
||||
const updatePageLink=()=>{const a=$('page-open');a.hidden=!data.page_path||!editing.page_uuid||fields.page_path.value!==data.page_path;a.removeAttribute('href');if(!a.hidden)a.href='/'+data.page_path.replace(/^\/+/, '').split('/').map(encodeURIComponent).join('/');};
|
||||
$('page-open').textContent=t('linked')+' ↗';$('page-open').title=ja?'関連ページを新しいタブで開く':'Open related page in a new tab';updatePageLink();
|
||||
if(!data.page_path&&editing.page_uuid)$('fields').append(el('small',t('hiddenLink')));
|
||||
if(editing.page_uuid){const unlink=el('button',t('unlink'));unlink.type='button';unlink.disabled=!writable;unlink.addEventListener('click',()=>{editing.page_uuid='';fields.page_path.value='';fields.page_path.dataset.changed='true';dirty=true;unlink.disabled=true;updatePageLink();});$('fields').append(unlink);}
|
||||
fields.page_path.addEventListener('input',()=>{fields.page_path.dataset.changed='true';updatePageLink();});
|
||||
if(id&&editing.kind==='task'){
|
||||
if(writable&&!editing.archived&&!['done','cancelled'].includes(editing.status)){const focus=el('button',ja?'◷ このタスクに集中':'◷ Focus on this task','task-full');focus.type='button';focus.addEventListener('click',()=>{if(dirty){$('error').textContent=ja?'先にタスクの変更を保存してください。':'Save your task changes first.';return;}const task={...editing};if(closeDialog())app.dispatchEvent(new CustomEvent('task-focus',{detail:task}));});$('fields').append(focus);}
|
||||
const plan=el('button',ja?'▦ 時間枠をカレンダーへ':'▦ Calendar time blocks','task-full');plan.type='button';plan.id='tasks-plan-open';
|
||||
|
||||
Reference in new issue
Block a user