✨ 优化跨域资源确定逻辑 #56

src/apps/grant/background.ts

@@ -398,17 +398,23 @@ export class BackgroundGrant {
 										MsgCenter.removeListenerAll(
 											PermissionConfirm + confirm.uuid
 										);
-										next();
+										void next();
 									}, 300000);
 								}
 								// 处理下一个
-								const next = () => {
+								const next = async () => {
 									// 一个打开确定,一群不打开只监听消息
 									const item = list.pop();
 									if (item) {
+										// 使用已允许了的域名做确认
+										const perList = await _this.permissionModel.list(
+											(table) => {
+												return table.where({ scriptId: script.id });
+											}
+										);
 										void App.Cache.set('confirm:info:' + item.uuid, [
 											item,
-											list.length,
+											perList.length || list.length,
 										]);
 										void chrome.tabs.create({
 											url: chrome.runtime.getURL(
@@ -445,11 +451,11 @@ export class BackgroundGrant {
 										case 5:
 										case 3: {
 											ret.permissionValue = confirm.permissionValue || '';
-											next();
+											void next();
 											break;
 										}
 										default:
-											next();
+											void next();
 											break;
 									}
 									//临时 放入缓存

src/apps/logger/console.ts

@@ -41,6 +41,6 @@ export class ConsoleTransports implements LoggerTransports {
             catalogStr=catalogStr.substring(0, catalogStr.length - 1);
 			catalogStr += ']';
 		}
-		console.log('[%s]%s: %s', level, catalogStr, info);
+		console.log('[%s]%s - %s', level, catalogStr, info);
 	}
 }

src/model/migrate.ts

@@ -59,4 +59,7 @@ export function migrate() {
     db.version(14).stores({
         value: '++id,[scriptId+key],[storageName+key]',
     });
+    db.version(15).stores({
+        permission: '++id,scriptId,[scriptId+permission+permissionValue],createtime,updatetime',
+    });
 }

src/sandbox.ts

@@ -21,7 +21,7 @@ InitApp({
 const logger = createLogger({
 	level: process.env.NODE_ENV === 'development' ? 'debug' : 'info',
 	catalog: {
-		name: 'sandbox',
+		type: 'sandbox',
 	},
 	transports: [new ConsoleTransports()],
 });
@@ -178,7 +178,7 @@ function runCrontab(script: ScriptCache) {
 		if (nextTime(val) == '错误的定时表达式') {
 			return;
 		}
-		logger.debug(`${script.name} corntab ${val}`);
+		logger.debug(`${script.name} corntab "${val}"`);
 
 		const cron = new CronJob(
 			val,

src/views/pages/Confirm/index.vue

@@ -84,6 +84,7 @@ export default class Confirm extends Vue {
     }
     this.uuid = uuid;
     [this.param, this.num] = await this.scriptConrtoller.getConfirmInfo(uuid);
+    console.log(this.num);
     let i = setInterval(() => {
       this.timeout--;
       if (!this.timeout) {