Skip to content

Commit

Permalink
🐛 修复某些时候超时才打开权限确认窗口的问题
Browse files Browse the repository at this point in the history
  • Loading branch information
@CodFrm
CodFrm committed Jan 19, 2022
1 parent 854dd26 commit b861869
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 49 deletions.
90 changes: 49 additions & 41 deletions src/apps/grant/background.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { ScriptManager } from '../script/manager';
import { Grant, Api, IPostMessage, IGrantListener, ConfirmParam, PermissionParam, FreedCallback } from './interface';
import { v4 as uuidv4 } from 'uuid'
import { ValueModel } from '@App/model/value';
import { LOGGER_LEVEL_INFO } from '@App/model/do/logger';
import { LOGGER_LEVEL, LOGGER_LEVEL_INFO } from '@App/model/do/logger';
import { Permission } from '@App/model/do/permission';
import { Script } from '@App/model/do/script';
import { Value } from '@App/model/do/value';
Expand Down Expand Up @@ -344,10 +344,12 @@ export class BackgroundGrant {
// 处理下一个
const next = () => {
// 一个打开确定,一群不打开只监听消息
const confirm = list.pop();
if (confirm) {
void App.Cache.set('confirm:info:' + confirm.uuid, confirm);
chrome.tabs.create({ url: chrome.runtime.getURL('confirm.html?uuid=' + confirm.uuid) });
const item = list.pop();
if (item) {
void App.Cache.set('confirm:info:' + item.uuid, [item, list.length]);
chrome.tabs.create({ url: chrome.runtime.getURL('confirm.html?uuid=' + item.uuid) });
} else {
void App.Cache.del('confirm:window:' + confirm.permission + ':list:' + script.id.toString());
}
}
const listener = async (param: IPermissionConfirm) => {
Expand Down Expand Up @@ -919,31 +921,31 @@ export class BackgroundGrant {
silent: details.silent,
progress: details.progress
};
chrome.notifications.update(id, options);
chrome.notifications.update(<string>id, options);
return resolve(undefined);
});
}

@BackgroundGrant.GMFunction({ default: true, background: true })
protected CAT_setLastRuntime(grant: Grant, post: IPostMessage): Promise<any> {
return new Promise(resolve => {
this.scriptMgr.setLastRuntime(grant.id, grant.params[0]);
void this.scriptMgr.setLastRuntime(grant.id, <number>grant.params[0]);
return resolve(undefined);
});
}

@BackgroundGrant.GMFunction({ default: true, background: true })
protected CAT_setRunError(grant: Grant, post: IPostMessage): Promise<any> {
return new Promise(resolve => {
this.scriptMgr.setRunError(grant.id, grant.params[0], grant.params[1]);
void this.scriptMgr.setRunError(grant.id, <string>grant.params[0], <number>grant.params[1]);
return resolve(undefined);
});
}

@BackgroundGrant.GMFunction({ default: true, background: true })
protected CAT_runComplete(grant: Grant, post: IPostMessage): Promise<any> {
return new Promise(resolve => {
this.scriptMgr.setRunComplete(grant.id);
void this.scriptMgr.setRunComplete(grant.id);
return resolve(undefined);
});
}
Expand All @@ -954,7 +956,7 @@ export class BackgroundGrant {
if (grant.params.length == 0) {
return reject('param is null');
}
App.Log.Logger(grant.params[1] ?? LOGGER_LEVEL_INFO, 'GM_log', grant.params[0], grant.name, grant.id);
App.Log.Logger(<LOGGER_LEVEL>grant.params[1] ?? LOGGER_LEVEL_INFO, 'GM_log', <string>grant.params[0], grant.name, grant.id);
AppEvent.trigger(ListenGmLog, {
level: grant.params[1] ?? LOGGER_LEVEL_INFO,
scriptId: grant.id,
Expand All @@ -967,36 +969,39 @@ export class BackgroundGrant {
@BackgroundGrant.GMFunction()
protected GM_setValue(grant: Grant, post: IPostMessage, script?: Script): Promise<any> {
//getValue直接从缓存中返回了,无需编写
return new Promise(async resolve => {
const [key, value] = grant.params;
let model: Value | undefined;
if (script?.metadata['storagename']) {
model = await this.valueModel.findOne({ storageName: script.metadata['storagename'][0], key: key });
} else {
model = await this.valueModel.findOne({ scriptId: script?.id, key: key });
}
if (!model) {
model = {
id: 0,
scriptId: script?.id || 0,
storageName: (script?.metadata['storagename'] && script?.metadata['storagename'][0]) || '',
key: key,
value: value,
createtime: new Date().getTime()
return new Promise(resolve => {
const hanlder = async () => {
const [key, value] = grant.params;
let model: Value | undefined;
if (script?.metadata['storagename']) {
model = await this.valueModel.findOne({ storageName: script.metadata['storagename'][0], key: key });
} else {
model = await this.valueModel.findOne({ scriptId: script?.id, key: key });
}
if (!model) {
model = {
id: 0,
scriptId: script?.id || 0,
storageName: (script?.metadata['storagename'] && script?.metadata['storagename'][0]) || '',
key: key,
value: value,
createtime: new Date().getTime()
}
} else {
model.value = value;
}

if (value === undefined) {
void this.valueModel.delete(model.id);
AppEvent.trigger(ScriptValueChange, { model, tabid: grant.tabId });
return resolve(undefined);
}
} else {
model.value = value;
}

if (value === undefined) {
this.valueModel.delete(model.id);
void this.valueModel.save(model);
AppEvent.trigger(ScriptValueChange, { model, tabid: grant.tabId });
return resolve(undefined);
resolve(undefined);
}

this.valueModel.save(model);
AppEvent.trigger(ScriptValueChange, { model, tabid: grant.tabId });
resolve(undefined);
void hanlder();
})
}

Expand All @@ -1021,7 +1026,8 @@ export class BackgroundGrant {
regex = regex.replace('*', '(?:^|.*?)')
}
regex = regex.replace(/\//g, '\\/');
ret += `if(/${regex}/.test(url)){return "${val.proxyServer.scheme?.toUpperCase() || 'HTTP'} ${val.proxyServer.host}` + (val.proxyServer.port ? ':' + val.proxyServer.port : '') + '"}\n';
ret += `if(/${regex}/.test(url)){return "${val.proxyServer.scheme?.toUpperCase() || 'HTTP'} ${val.proxyServer.host}` +
(val.proxyServer.port ? ':' + val.proxyServer.port.toString() : '') + '"}\n';
});
});
}
Expand Down Expand Up @@ -1052,7 +1058,7 @@ export class BackgroundGrant {
})
protected CAT_setProxy(grant: Grant, post: IPostMessage): Promise<any> {
return new Promise(resolve => {
BackgroundGrant.proxyRule.set(grant.id, grant.params[0]);
BackgroundGrant.proxyRule.set(grant.id, <CAT_Types.ProxyRule[]>grant.params[0]);
App.Log.Debug('background', 'enable proxy', grant.name);
chrome.proxy.settings.set({
value: {
Expand Down Expand Up @@ -1102,6 +1108,7 @@ export class BackgroundGrant {
button: 'left',
clickCount: 1
}, (result) => {
console.log(result);
});
});
} else {
Expand All @@ -1120,6 +1127,7 @@ export class BackgroundGrant {
button: 'left',
clickCount: 1
}, (result) => {
console.log(result);
});
});
});
Expand All @@ -1130,18 +1138,18 @@ export class BackgroundGrant {
}

protected static textarea: HTMLElement = document.createElement('textarea');
public static clipboardData: any;
public static clipboardData: { type?: string, data: string } | undefined;

@BackgroundGrant.GMFunction({
listener: () => {
document.body.appendChild(BackgroundGrant.textarea);
document.addEventListener('copy', (e: ClipboardEvent) => {
if (!BackgroundGrant.clipboardData) {
if (!BackgroundGrant.clipboardData || !e.clipboardData) {
return;
}
e.preventDefault();
const { type, data } = BackgroundGrant.clipboardData;
(<any>e).clipboardData.setData(type || 'text/plain', data);
e.clipboardData.setData(type || 'text/plain', data);
BackgroundGrant.clipboardData = undefined;
})
}
Expand Down
4 changes: 2 additions & 2 deletions src/apps/script/controller.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,10 @@ export class ScriptController {
});
}

public getConfirmInfo(uuid: string): Promise<ConfirmParam> {
public getConfirmInfo(uuid: string): Promise<[ConfirmParam, number]> {
return new Promise(resolve => {
MsgCenter.sendMessage(RequestConfirmInfo, uuid, resp => {
resolve(<ConfirmParam>resp);
resolve(<[ConfirmParam, number]>resp);
});
});
}
Expand Down
18 changes: 13 additions & 5 deletions src/views/pages/Confirm/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,12 @@
<v-btn @click="allow(true, 5)" color="primary">
总是允许此{{ param.permissionContent }}
</v-btn>
<v-btn v-if="param.wildcard" @click="allow(true, 4)" color="warning">
总是允许全部{{ param.permissionContent }}
<v-btn
v-if="param.wildcard && num > 2"
@click="allow(true, 4)"
color="warning"
>
总是允许剩下{{ num }}个{{ param.permissionContent }}
</v-btn>
</div>

Expand All @@ -46,8 +50,11 @@
<v-btn @click="allow(false, 5)" color="error">
总是拒绝此{{ param.permissionContent }}
</v-btn>
<v-btn v-if="param.wildcard" @click="allow(false, 4)" color="error"
>总是拒绝全部{{ param.permissionContent }}</v-btn
<v-btn
v-if="param.wildcard && num > 2"
@click="allow(false, 4)"
color="error"
>总是拒绝剩下{{ num }}个{{ param.permissionContent }}</v-btn
>
</div>
</v-main>
Expand All @@ -65,6 +72,7 @@ export default class Confirm extends Vue {
scriptConrtoller: ScriptController = new ScriptController();
protected param: ConfirmParam = <ConfirmParam>{};
protected num = 0;
protected timeout = 30;
protected uuid = '';
protected select = false;
Expand All @@ -75,7 +83,7 @@ export default class Confirm extends Vue {
return;
}
this.uuid = uuid;
this.param = await this.scriptConrtoller.getConfirmInfo(uuid);
[this.param, this.num] = await this.scriptConrtoller.getConfirmInfo(uuid);
let i = setInterval(() => {
this.timeout--;
if (!this.timeout) {
Expand Down
2 changes: 1 addition & 1 deletion src/views/pages/Option/tabs/ScriptList.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1143,7 +1143,7 @@ export default class ScriptList extends Vue {
BackgroundGrant.clipboardData = {
data: msg,
};
document.execCommand('copy', false, <any>null);
document.execCommand('copy', false, undefined);
scriptModule.showSnackbar('复制成功');
}
Expand Down

0 comments on commit b861869

Please sign in to comment.