@@ -50,7 +50,7 @@ function getPath(url) {
5050
5151function getSystemCfgs ( ) {
5252 return {
53- env : $ . isSurge ( ) ? 'Surge' : $ . isQuanX ? 'QuanX' : 'Loon' ,
53+ env : $ . isSurge ( ) ? 'Surge' : $ . isQuanX ( ) ? 'QuanX' : $ . isLoon ( ) ? 'Loon' : 'Node ',
5454 envs : [
5555 { id : 'Surge' , icon : 'https://raw.githubusercontent.com/Orz-3/task/master/surge.png' } ,
5656 { id : 'QuanX' , icon : 'https://raw.githubusercontent.com/Orz-3/task/master/quantumultx.png' } ,
@@ -388,32 +388,26 @@ function handleApi() {
388388 if ( data . cmd === 'saveSession' ) {
389389 const session = data . val
390390 const sessions = getSessions ( )
391- const isExistsApp = getSystemApps ( ) . find ( ( app ) => app . id === session . appId )
392- if ( isExistsApp ) {
393- sessions . push ( session )
394- const savesuc = $ . setdata ( JSON . stringify ( sessions ) , $ . KEY_sessions )
395- $ . subt = `保存会话: ${ savesuc ? '成功' : '失败' } (${ session . appName } )`
396- $ . desc = [ ]
397- $ . desc . push ( `会话名称: ${ session . name } ` , `应用名称: ${ session . appName } ` , `会话编号: ${ session . id } ` , `应用编号: ${ session . appId } ` , `数据: ${ JSON . stringify ( session ) } ` )
398- $ . msg ( $ . name , $ . subt , $ . desc . join ( '\n' ) )
399- }
391+ sessions . push ( session )
392+ const savesuc = $ . setdata ( JSON . stringify ( sessions ) , $ . KEY_sessions )
393+ $ . subt = `保存会话: ${ savesuc ? '成功' : '失败' } (${ session . appName } )`
394+ $ . desc = [ ]
395+ $ . desc . push ( `会话名称: ${ session . name } ` , `应用名称: ${ session . appName } ` , `会话编号: ${ session . id } ` , `应用编号: ${ session . appId } ` , `数据: ${ JSON . stringify ( session ) } ` )
396+ $ . msg ( $ . name , $ . subt , $ . desc . join ( '\n' ) )
400397 }
401398 // 保存当前会话
402399 else if ( data . cmd === 'saveCurAppSession' ) {
403400 const app = data . val
404- const isExistsApp = getSystemApps ( ) . find ( ( _app ) => _app . id === app . id )
405- if ( isExistsApp ) {
406- let isAllSaveSuc = true
407- app . datas . forEach ( ( data ) => {
408- const oldval = $ . getdata ( data . key )
409- const newval = data . val
410- const savesuc = $ . setdata ( `${ newval } ` , data . key )
411- isAllSaveSuc = ! savesuc ? false : isAllSaveSuc
412- $ . log ( '' , `❕ ${ app . name } , 保存设置: ${ data . key } ${ savesuc ? '成功' : '失败' } !` , `旧值: ${ oldval } ` , `新值: ${ newval } ` )
413- } )
414- $ . subt = `保存会话: ${ isAllSaveSuc ? '成功' : '失败' } (${ app . name } )`
415- $ . msg ( $ . name , $ . subt , '' )
416- }
401+ let isAllSaveSuc = true
402+ app . datas . forEach ( ( data ) => {
403+ const oldval = $ . getdata ( data . key )
404+ const newval = data . val
405+ const savesuc = $ . setdata ( `${ newval } ` , data . key )
406+ isAllSaveSuc = ! savesuc ? false : isAllSaveSuc
407+ $ . log ( '' , `❕ ${ app . name } , 保存设置: ${ data . key } ${ savesuc ? '成功' : '失败' } !` , `旧值: ${ oldval } ` , `新值: ${ newval } ` )
408+ } )
409+ $ . subt = `保存会话: ${ isAllSaveSuc ? '成功' : '失败' } (${ app . name } )`
410+ $ . msg ( $ . name , $ . subt , '' )
417411 }
418412 // 保存设置
419413 else if ( data . cmd === 'saveSettings' ) {
@@ -514,7 +508,9 @@ async function handleApp(appId) {
514508 const box = await getBoxData ( )
515509 const apps = [ ]
516510 const cursysapp = box . sysapps . find ( ( app ) => app . id === appId )
517- apps . push ( cursysapp )
511+ if ( cursysapp ) {
512+ apps . push ( cursysapp )
513+ }
518514 box . appsubs . filter ( ( sub ) => sub . enable !== false ) . forEach ( ( sub ) => apps . push ( ...sub . apps ) )
519515 const curapp = apps . find ( ( app ) => app . id === appId )
520516 $ . html = printHtml ( JSON . stringify ( box ) , JSON . stringify ( curapp ) , 'appsession' )
0 commit comments