fix: preserve strategy intent and recover accounts automatically
This commit is contained in:
+51
-20
@@ -22,6 +22,35 @@ function connectionState(summary) {
|
||||
|
||||
function gameAvailable(account) { return Boolean(account && !state.webStatusError && !account.transportErrors.has('status') && connectionState(account.summary)==='online'); }
|
||||
|
||||
function strategyRequested(summary) { return typeof summary?.strategy_requested==='boolean'?summary.strategy_requested:Boolean(summary?.running); }
|
||||
|
||||
function strategyDetails(account) {
|
||||
if(!account)return '';
|
||||
const summary=account.summary,requested=strategyRequested(summary);
|
||||
if(!requested)return summary.strategy_requested===false?'策略已停止(用户暂停);暂停会保留到再次“开启”,账号仍会按设定时长自动重登。':'策略已停止,可在顶部“开启”继续执行已勾选功能。';
|
||||
if(summary.strategy_state==='blocked')return `策略等待处理:${summary.strategy_message || '请检查执行结果,确认后再继续。'}`;
|
||||
if(summary.running && gameAvailable(account))return '角色状态自动刷新,正在自动执行已配置且已勾选的功能;可在顶部“停止”。';
|
||||
const parts=['已请求自动执行已勾选功能,等待恢复;可在顶部“停止”暂停执行。'];
|
||||
if(summary.strategy_message)parts.push(summary.strategy_message);
|
||||
const value=summary.strategy_retry_at;
|
||||
const retryAt=typeof value==='number'?(value<1e12?value*1000:value):Date.parse(value);
|
||||
if(value!=null && Number.isFinite(retryAt)){
|
||||
const seconds=Math.max(0,Math.ceil((retryAt-Date.now())/1000));
|
||||
parts.push(seconds?`${seconds} 秒后检查策略恢复`:'等待策略恢复检查结果');
|
||||
}
|
||||
return parts.join(';');
|
||||
}
|
||||
|
||||
function acceptSummary(account,summary) {
|
||||
account.summary=summary;
|
||||
// Keep the last observed failure separate from current connection health.
|
||||
const kind=connectionState(summary);
|
||||
const failure=summary.error || (['retrying','expired'].includes(kind)?summary.connection_message:'');
|
||||
if(failure)account.lastFailure=failure;
|
||||
}
|
||||
|
||||
function failureHistory(account) { return account?.lastFailure && connectionState(account.summary)==='online'?`上次失败:${account.lastFailure}`:''; }
|
||||
|
||||
function connectionReason(summary) {
|
||||
return summary?.connection_message || summary?.error || {retrying:'游戏请求暂时失败,等待重试。',expired:'游戏登录状态已失效,请在登录页重新登录或恢复会话。',offline:'尚未连接游戏,请在登录页登录或恢复已保存会话。'}[connectionState(summary)] || '';
|
||||
}
|
||||
@@ -46,7 +75,8 @@ function connectionDetails(account) {
|
||||
function transportMessages(account=current()) { return [...(account?.transportErrors.values() || [])]; }
|
||||
|
||||
function renderStatus() {
|
||||
const message=[connectionDetails(current()),...transportMessages()].filter(Boolean).join(';') || state.statusMessage;
|
||||
const account=current();
|
||||
const message=[connectionDetails(account),typeof account?.summary.strategy_requested==='boolean'?strategyDetails(account):'',failureHistory(account),...transportMessages()].filter(Boolean).join(';') || state.statusMessage;
|
||||
const node=$('#status-text');if(node.textContent!==message)node.textContent=message;node.title=message;
|
||||
}
|
||||
|
||||
@@ -72,8 +102,9 @@ function renderPageConnection(page) {
|
||||
}
|
||||
|
||||
function makeAccount(summary) {
|
||||
return {id:summary.id,summary,config:null,revision:null,edits:new Map(),pages:new Map(),page:'login',jobs:new Map(),savePromise:null,saveError:null,
|
||||
logs:createLogState(),loadingConfig:false,transportErrors:new Map()};
|
||||
const account={id:summary.id,summary,config:null,revision:null,edits:new Map(),pages:new Map(),page:'login',jobs:new Map(),savePromise:null,saveError:null,
|
||||
logs:createLogState(),loadingConfig:false,transportErrors:new Map(),lastFailure:''};
|
||||
acceptSummary(account,summary);return account;
|
||||
}
|
||||
|
||||
function setStatus(message) { state.statusMessage=message;renderStatus(); }
|
||||
@@ -90,9 +121,9 @@ function renderAccountTabs() {
|
||||
}
|
||||
const summary=account.summary,selected=state.active===account.id,kind=connectionState(summary);
|
||||
$('.account-label',button).textContent=summary.label || summary.player?.name || '账号';
|
||||
$('.account-dot',button).className=`account-dot${summary.error || kind!=='online'?' error':summary.running?' running':''}`;
|
||||
$('.account-dot',button).className=`account-dot${kind!=='online' || summary.strategy_state==='blocked'?' error':summary.running?' running':''}`;
|
||||
button.setAttribute('aria-selected',String(selected));button.tabIndex=selected?0:-1;
|
||||
button.title=[summary.label || '账号',summary.demo?'离线演示':connectionLabels[kind],summary.running?'策略运行中':'',kind==='online'?summary.error:connectionReason(summary)].filter(Boolean).join(' · ');
|
||||
button.title=[summary.label || '账号',summary.demo?'离线演示':connectionLabels[kind],strategyDetails(account),kind==='online'?failureHistory(account):connectionReason(summary)].filter(Boolean).join(' · ');
|
||||
});
|
||||
}
|
||||
|
||||
@@ -113,9 +144,9 @@ function renderSummary() {
|
||||
for (const [id,key] of [['player-level','level'],['player-money','money'],['player-ke','ke'],['player-ti','ti']]) $('#'+id).textContent=number(player[key]);
|
||||
$('#player-exp').textContent=player.exp==null?'—':`${number(player.exp)} / ${number(player.next_exp)}`;
|
||||
$('#experience-progress').max=Math.max(1,Number(player.next_exp)||1);$('#experience-progress').value=Number(player.exp)||0;
|
||||
const run=$('#strategy-toggle');run.textContent=summary?.running?'停止':'开启';run.classList.toggle('running',Boolean(summary?.running));run.disabled=!account || !summary?.running && (!account.config || !connected);
|
||||
run.setAttribute('aria-pressed',String(Boolean(summary?.running)));
|
||||
run.title=summary?.running?'停止自动执行已勾选功能;取消尚未发送的请求':!connected?details:'开启后自动执行各页面已勾选功能';
|
||||
const requested=strategyRequested(summary),run=$('#strategy-toggle');run.textContent=requested?'停止':'开启';run.classList.toggle('running',requested);run.disabled=!account || !requested && (!account.config || !connected);
|
||||
run.setAttribute('aria-pressed',String(requested));
|
||||
run.title=requested?'暂停自动执行已勾选功能,取消尚未发送的请求;掉线、重新登录和服务重启后仍保持暂停,直到再次“开启”;账号仍会自动重登。':!connected?details:'开启后自动执行各页面已勾选功能,连接恢复后继续执行';
|
||||
$('[data-command="start"]').disabled=!account?.config || !connected;
|
||||
$('[data-command="start-all"]').disabled=![...state.accounts.values()].some(gameAvailable);
|
||||
if (account?.config && document.activeElement!==$('#refresh-interval')) $('#refresh-interval').value=String(account.config.interval);
|
||||
@@ -123,7 +154,7 @@ function renderSummary() {
|
||||
$('#refresh').disabled=!connected;$('#refresh').title=connected?'读取游戏状态并预览策略':details;
|
||||
const task=account?[...account.jobs.values()].at(-1)?.job:null;
|
||||
$('#job-status').textContent=task?`${operationLabels[task.operation] || task.operation} · ${jobLabels[task.status]}`:summary?.busy?'后台任务执行中':'';
|
||||
const message=[details || summary?.error || (demo?'当前为离线演示,不连接游戏服务器。':connected?summary.running?'角色状态自动刷新,正在自动执行已配置且已勾选的功能;可在顶部“停止”。':'角色状态自动刷新;策略已停止,可在顶部“开启”继续执行已勾选功能。':'请在登录页输入账号密码,或恢复已保存会话。'),...transportMessages(account)].filter(Boolean).join(';');
|
||||
const message=[demo?'当前为离线演示,不连接游戏服务器。':'',strategyDetails(account),details,failureHistory(account),...transportMessages(account)].filter(Boolean).join(';');
|
||||
$('#data-summary').textContent=message;$('#data-summary').title=message;
|
||||
account?.pages.forEach(renderPageConnection);renderStatus();
|
||||
syncSaveStatus(account);
|
||||
@@ -254,13 +285,14 @@ async function perform(account,operation,payload={},options={}) {
|
||||
if(!state.accounts.has(account.id))return result;
|
||||
if(result?.config){account.config=clone(result.config);account.revision=result.revision;}
|
||||
if(['enter_server','restore_session','logout','forget_login','import_config','import_yields'].includes(operation))await refreshConfig(account);
|
||||
try{account.summary=await api.status(account.id);account.transportErrors.delete('status');}
|
||||
try{acceptSummary(account,await api.status(account.id));account.transportErrors.delete('status');}
|
||||
catch(failure){transportError(account,'status','Web 账号状态',failure);failure.connection=true;throw failure;}
|
||||
renderAccountTabs();renderSummary();
|
||||
if((gameRefreshOperations.has(operation)||loginOperations.has(operation)) && !gameAvailable(account)){setStatus('工作台状态已更新');throw connectionError(account);}
|
||||
const page=options.page || account.pages.get(account.page);if(page)await loadPage(page,true);
|
||||
if(operation==='login'&&result)account.pages.get('login')?.login?.update(result);
|
||||
const message=loginOperations.has(operation)?account.summary.running?'已读取角色,已自动开启策略,执行已配置且已勾选的功能;可在顶部“停止”。':'已读取角色。策略已停止,可在顶部“开启”继续执行已勾选功能。':result?.message;
|
||||
if(operation==='forget_login')account.lastFailure='';
|
||||
const message=loginOperations.has(operation)?account.summary.running && strategyRequested(account.summary)?'已读取角色,已自动开启策略,执行已配置且已勾选的功能;可在顶部“停止”。':`已读取角色。${strategyDetails(account)}`:result?.message;
|
||||
if(message && operation!=='refresh')notice(message);
|
||||
setStatus(operation==='refresh'?'状态已刷新':message || `${operationLabels[operation] || '操作'}已完成`);
|
||||
return result;
|
||||
@@ -325,10 +357,9 @@ async function pageAction(page,action,currency) {
|
||||
if(operation==='reveal_breakthrough'){page.root.querySelector('th[data-column=breakthrough_selected]')?.scrollIntoView({block:'nearest',inline:'center'});return;}
|
||||
if(operation==='apply_preset'){
|
||||
const preset=page.data.details.preset;
|
||||
if(account.summary.running)await perform(account,'stop');
|
||||
Object.entries(preset.patch || {}).forEach(([section,fields])=>Object.entries(fields).forEach(([key,value])=>editConfig(account,[section,key],value)));
|
||||
editConfig(account,['policy','egg_rules'],preset.egg_rules);
|
||||
await flushConfig(account);notice('预设已保存。开启顶部策略后运行。');return;
|
||||
await flushConfig(account);notice(`预设已保存;${strategyDetails(account)}`);return;
|
||||
}
|
||||
if(operation==='expand_regions'||operation==='collapse_regions'){page.table?.expand(operation==='expand_regions');return;}
|
||||
if(operation==='import_yields'){return importYields(account);}
|
||||
@@ -378,7 +409,7 @@ async function exportYields(account=current()) {
|
||||
async function command(name,account=current()) {
|
||||
try {
|
||||
if(name==='add-account'||name==='add-demo')return await addAccount(name==='add-demo');
|
||||
if(name==='about')return dialog('关于牧场助手',el('div',{},el('p',{text:`牧羊人之心牧场助手 Web ${state.meta?.version || '2.0.3'}`}),el('p',{text:`游戏数据版本 ${state.meta?.gameVersion || '1.9.68'}`}),el('p',{class:'info-note',text:'与桌面助手共用核心策略。配置在服务端自动保存;每次成功登录后自动执行已勾选功能,可在顶部“停止”。服务重启后须先成功登录才执行。'})),{info:true});
|
||||
if(name==='about')return dialog('关于牧场助手',el('div',{},el('p',{text:`牧羊人之心牧场助手 Web ${state.meta?.version || '2.0.4'}`}),el('p',{text:`游戏数据版本 ${state.meta?.gameVersion || '1.9.68'}`}),el('p',{class:'info-note',text:'与桌面助手共用核心策略。配置在服务端自动保存;在线时默认自动执行已勾选功能,连接恢复后继续执行。顶部“停止”仅暂停执行,暂停在重新登录和服务重启后仍保留,直到再次“开启”。已保存的账号按设定时长自动重登,退出登录不取消;只有清除登录记录或删除账号才取消。'})),{info:true});
|
||||
if(name==='updates')return await showUpdates();
|
||||
if(name==='admin-logout'){hideWorkbench();try{await api.logout();}finally{requireAuth();}return;}
|
||||
if(!account)throw new Error('请先新增或选择账号。');
|
||||
@@ -394,7 +425,7 @@ async function command(name,account=current()) {
|
||||
}
|
||||
if(name==='logout')return await perform(account,'logout');
|
||||
if(name==='forget-login'){
|
||||
if(await confirm('退出并清除登录记录','将退出当前角色,删除当前账号保存的登录会话和账号密码。培养策略和其他账号不受影响。',{confirm:'清除登录记录',danger:true}))await perform(account,'forget_login');return;
|
||||
if(await confirm('退出并清除登录记录','将退出当前角色,删除当前账号保存的登录会话和账号密码,并取消该账号的自动重登。培养策略和其他账号不受影响。',{confirm:'清除登录记录',danger:true}))await perform(account,'forget_login');return;
|
||||
}
|
||||
if(name==='remove-account'){
|
||||
if(!await confirm('移除当前账号',`移除“${account.summary.label || '当前账号'}”及其保存的会话和策略?此操作无法撤销。`,{confirm:'移除账号',danger:true}))return;
|
||||
@@ -408,8 +439,8 @@ async function command(name,account=current()) {
|
||||
if(name==='import-config'){
|
||||
const file=await filePicker('.json');if(!file)return;if(file.size>1024*1024)throw new Error('策略文件过大。');
|
||||
let config;try{config=JSON.parse(await file.text());}catch{throw new Error('策略文件不是有效的 JSON。');}
|
||||
if(!await confirm('导入当前账号策略','将替换当前账号策略并停止执行;下次成功登录会自动执行已勾选功能。',{confirm:'导入策略'}))return;
|
||||
await flushConfig(account);const result=await trackJob(account,await api.importConfig(account.id,config));await refreshConfig(account);notice('策略已导入,执行已停止;下次成功登录会自动执行已勾选功能。');await loadPage(getPage(account,account.page),true);return result;
|
||||
if(!await confirm('导入当前账号策略','将替换当前账号策略配置;自动执行仍遵循当前开启 / 停止设置。',{confirm:'导入策略'}))return;
|
||||
await flushConfig(account);const result=await trackJob(account,await api.importConfig(account.id,config));await refreshConfig(account);notice('策略已导入;自动执行仍遵循当前开启 / 停止设置。');await loadPage(getPage(account,account.page),true);return result;
|
||||
}
|
||||
if(name==='import-yields')return await importYields(account);
|
||||
if(name==='export-yields')return await exportYields(account);
|
||||
@@ -555,7 +586,7 @@ async function syncAccounts() {
|
||||
const ids=new Set(summaries.map(summary=>summary.id));
|
||||
for(const [id,account]of state.accounts)if(!ids.has(id)){account.pages.forEach(page=>{clearTimeout(page.loadTimer);page.root.remove();});state.accounts.delete(id);}
|
||||
summaries.forEach(summary=>{
|
||||
const account=state.accounts.get(summary.id);if(account){account.summary=summary;account.transportErrors.delete('status');if(account.config&&account.revision!==summary.revision&&!account.edits.size&&!account.savePromise)refreshConfig(account).catch(error);}
|
||||
const account=state.accounts.get(summary.id);if(account){acceptSummary(account,summary);account.transportErrors.delete('status');if(account.config&&account.revision!==summary.revision&&!account.edits.size&&!account.savePromise)refreshConfig(account).catch(error);}
|
||||
else state.accounts.set(summary.id,makeAccount(summary));
|
||||
});
|
||||
renderAccountTabs();renderSummary();
|
||||
@@ -595,7 +626,7 @@ async function bootstrap() {
|
||||
$('#app').hidden=false;
|
||||
const [meta,schema]=await Promise.all([api.meta(),api.schema()]);state.meta=meta;state.schema=schema;
|
||||
if(state.redirecting)return;
|
||||
$('#app-version').textContent=meta.version || '2.0.3';$('#game-version').textContent=meta.gameVersion || '1.9.68';$('#access-mode').textContent=auth.access_mode==='local'||auth.access_mode==='loopback'?'本机工作台':auth.required?'管理工作台':'本机工作台';
|
||||
$('#app-version').textContent=meta.version || '2.0.4';$('#game-version').textContent=meta.gameVersion || '1.9.68';$('#access-mode').textContent=auth.access_mode==='local'||auth.access_mode==='loopback'?'本机工作台':auth.required?'管理工作台':'本机工作台';
|
||||
await syncAccounts();if(state.redirecting)return;state.ready=true;setStatus('工作台已连接');
|
||||
}catch(failure){if(failure.status===401||$('#app').hidden){requireAuth();return;}if(state.redirecting)return;setStatus(failure.message);$('#page-host').replaceChildren(el('div',{class:'initial-state'},el('p',{text:failure.message}),el('button',{text:'重新连接',onClick:bootstrap})));}
|
||||
}
|
||||
@@ -607,7 +638,7 @@ document.addEventListener('click',event=>{if(!event.target.closest('.menu'))$$('
|
||||
document.addEventListener('keydown',event=>{if(event.key==='Escape')$$('.menu[open]').forEach(menu=>menu.open=false);});
|
||||
$$('.menu').forEach(menu=>menu.addEventListener('toggle',()=>{if(menu.open)$$('.menu').filter(other=>other!==menu).forEach(other=>other.open=false);}));
|
||||
$('#add-account').addEventListener('click',()=>command('add-account'));
|
||||
$('#strategy-toggle').addEventListener('click',()=>command(current()?.summary.running?'stop':'start'));
|
||||
$('#strategy-toggle').addEventListener('click',()=>command(strategyRequested(current()?.summary)?'stop':'start'));
|
||||
$('#refresh').addEventListener('click',()=>{const account=current();if(account)perform(account,'refresh',{page:account.page}).catch(error);});
|
||||
$('#refresh-interval').addEventListener('change',event=>{if(current())editConfig(current(),['interval'],Number(event.target.value));});
|
||||
$('#save-status').tabIndex=0;$('#save-status').addEventListener('click',()=>command('save'));$('#save-status').addEventListener('keydown',event=>{if(event.key==='Enter')command('save');});
|
||||
|
||||
Reference in New Issue
Block a user