修改为老版本逻辑&优化日志

Author: CodFrm

src/internal/app/question.ts

@@ -1,6 +1,6 @@
-import { HttpUtils, removeHTML, randNumber } from "../utils/utils";
-import { SystemConfig } from "@App/config";
-import { Application } from "../application";
+import {HttpUtils, removeHTML, randNumber} from "../utils/utils";
+import {SystemConfig} from "@App/config";
+import {Application} from "../application";
 
 export interface Topic {
     topic: string
@@ -21,6 +21,7 @@ export interface Answer {
     answers?: Option[]
     correct: Option[]
     id?: string
+
     Equal(content1: string, content2: string): boolean
 }
 
@@ -31,20 +32,25 @@ export class PushAnswer implements Answer {
     public status: TopicStatus;
     public answers: Option[];
     public correct: Option[];
+
     public Equal(content1: string, content2: string): boolean {
         return content1 == content2;
     }
 }
 
 export interface Options {
     Random(): TopicStatus;
+
     Fill(s: Answer): TopicStatus;
+
     Correct(): Answer
 }
 
 export interface Question extends Options {
     GetType(): TopicType;
+
     GetTopic(): string;
+
     SetStatus(status: TopicStatus): void;
 }
 
@@ -54,11 +60,17 @@ export type FillType = 1;
 // 1随机答案 2不支持的随机答案类型 3无答案 4无符合答案
 export type TopicStatus = "ok" | "random" | "no_support_random" | "no_answer" | "no_match";
 
-let statusMap = new Map<TopicStatus, string>();
-statusMap.set("ok", "搜索成功").set("random", "随机答案").set("no_support_random", "不支持的随机答案类型").
-    set("no_answer", "题库中没有搜索到答案").set("no_match", "题库中没有符合的答案");
+let topicStatusMap = new Map<TopicStatus, string>();
+topicStatusMap.set("ok", "搜索成功").set("random", "随机答案").set("no_support_random", "不支持的随机答案类型").set("no_answer", "题库中没有搜索到答案").set("no_match", "题库中没有符合的答案");
+let questionStatusMap = new Map<QuestionStatus, string>();
+questionStatusMap.set("success", "搜索成功").set("network", "题库网络错误").set("incomplete", "题库不全").set("processing", "搜索中...");
+
 export function TopicStatusString(status: TopicStatus): string {
-    return statusMap.get(status);
+    return topicStatusMap.get(status);
+}
+
+export function QuestionStatusString(status: QuestionStatus): string {
+    return questionStatusMap.get(status);
 }
 
 export function SwitchTopicType(title: string): TopicType {
@@ -85,21 +97,26 @@ export type QuestionStatus = "success" | "network" | "incomplete" | "processing"
 export type QuestionCallback = (status: QuestionStatus) => void
 
 export type QuestionBankCallback = (args: { status: QuestionStatus, answer: Answer[] }) => void
+
 export interface QuestionBank {
     Answer(topic: Topic[], resolve: QuestionBankCallback): void;
+
     Push(answer: Answer[]): Promise<QuestionStatus>;
+
     SetInfo(info: QuestionInfo): void;
 }
 
 export interface QuestionInfo {
     refer: string
     id: string
 }
+
 // 小工具题库
 export class ToolsQuestionBank implements QuestionBank {
 
     protected platform: string
     protected info: QuestionInfo;
+
     constructor(platform: string, info?: QuestionInfo) {
         this.platform = platform;
         this.info = info;
@@ -158,15 +175,15 @@ export class ToolsQuestionBank implements QuestionBank {
                     if (status != "success") {
                         retStatus = status;
                     }
-                    resolve({ status: "processing", answer: tmpResult });
+                    resolve({status: "processing", answer: tmpResult});
                     if (t < topic.length) {
                         next(t);
                     } else {
-                        return resolve({ status: retStatus, answer: answer });
+                        return resolve({status: retStatus, answer: answer});
                     }
                 },
                 error: () => {
-                    return resolve({ status: "network", answer: answer });
+                    return resolve({status: "network", answer: answer});
                 }
             });
         }
@@ -194,18 +211,23 @@ export class ToolsQuestionBank implements QuestionBank {
     }
 
 }
+
 export interface QuestionBankFacade {
     ClearQuestion(): void
+
     AddQuestion(q: Question): void
+
     Answer(callback: (status: QuestionStatus) => void): void
+
     Push(callback: (status: QuestionStatus) => void): void
 }
+
 export class ToolsQuestionBankFacade implements QuestionBankFacade {
     protected bank: QuestionBank;
     protected question: Array<Question>;
 
-    constructor(bank: QuestionBank) {
-        this.bank = bank;
+    constructor(platform: string, info?: any) {
+        this.bank = new ToolsQuestionBank(platform, info);
         this.question = new Array<Question>();
     }
 

src/internal/app/topic.ts

@@ -1,6 +1,10 @@
-import { QuestionBankFacade, ToolsQuestionBankFacade, ToolsQuestionBank, QuestionStatus, Question } from "./question";
-import { Application } from "../application";
-import { SystemConfig } from "@App/config";
+import {
+    QuestionBankFacade,
+    QuestionStatus,
+    Question,
+} from "./question";
+import {Application} from "../application";
+import {SystemConfig} from "@App/config";
 
 export interface QueryQuestions {
     QueryQuestions(): Question[];
@@ -31,31 +35,29 @@ export abstract class Topic {
         });
     }
 
-    public QueryAnswer(): Promise<any> {
-        return new Promise<any>(resolve => {
+    public QueryAnswer(): Promise<QuestionStatus> {
+        return new Promise<QuestionStatus>(resolve => {
             if (this.lock) {
-                return resolve("搜索中...");
+                return resolve("processing");
             }
             this.lock = true;
             Application.App.log.Info("题目搜索中...");
             this.addQuestion();
             this.answer.Answer((status: QuestionStatus) => {
                 this.lock = false;
+                resolve(status);
                 if (status == "network") {
-                    resolve("网络错误");
                     return Application.App.log.Fatal("题库无法访问,请查看:" + SystemConfig.url);
                 } else if (status == "incomplete") {
-                    resolve("答案不全");
                     return Application.App.log.Warn("题库答案不全,请手动填写操作");
                 }
-                resolve();
             });
         });
     }
 
     public CollectAnswer(): Promise<any> {
         return new Promise(resolve => {
-            Application.App.log.Debug("收集考试题目答案", this.context);
+            Application.App.log.Debug("收集题目答案", this.context);
             this.addQuestion();
             this.answer.Push((status: QuestionStatus) => {
                 Application.App.log.Debug("采集答案返回", status);

src/internal/utils/config.ts

@@ -1,6 +1,5 @@
-import { Client, NewExtensionClientMessage, NewChromeClientMessage } from "./message";
-import { randNumber } from "./utils";
-import { Application } from "../application";
+import {randNumber} from "./utils";
+import {Application} from "../application";
 
 export interface ConfigItems extends GetConfig {
     vtoken: string
@@ -17,13 +16,15 @@ export interface ConfigItems extends GetConfig {
 export class ChromeConfigItems implements ConfigItems {
 
     protected getConfig: GetConfig;
+
     constructor(getConfig: GetConfig) {
         this.getConfig = getConfig;
     }
 
     public GetConfig(key: string) {
         return this.getConfig.GetConfig(key);
     }
+
     public Watch(key: string | string[], callback: (key: string) => void): void {
         this.getConfig.Watch(key, callback);
     }
@@ -51,6 +52,10 @@ export class ChromeConfigItems implements ConfigItems {
         return this.bool(this.getConfig.GetConfig("auto"));
     }
 
+    public set auto(val: boolean) {
+        localStorage["auto"] = val;
+    }
+
     public get video_mute() {
         return this.bool(this.getConfig.GetConfig("video_mute"));
     }
@@ -76,6 +81,7 @@ export class ChromeConfigItems implements ConfigItems {
 
 export interface GetConfig {
     GetConfig(key: string): any
+
     Watch(key: Array<string> | string, callback: (key: string) => void): void
 }
 
@@ -109,8 +115,8 @@ class backendConfig implements GetConfig, SetConfig {
             let info: { [key: string]: number; } = {};
             info[key] = val;
             chrome.storage.sync.set(info, () => {
-                chrome.tabs.query({ active: true, currentWindow: true }, function (tabs) {
-                    chrome.tabs.sendMessage(tabs[0].id, { type: "cxconfig", key: key, value: val });
+                chrome.tabs.query({active: true, currentWindow: true}, function (tabs) {
+                    chrome.tabs.sendMessage(tabs[0].id, {type: "cxconfig", key: key, value: val});
                 });
                 resolve();
             });

src/internal/utils/log.ts

@@ -93,13 +93,19 @@ export class PageLog implements Logger {
         this.el && (this.el.innerHTML = text);
         return this;
     }
+
     public Warn(...args: any): Logger {
+        console.warn("[warn", this.getNowTime(), "]", ...args);
         return this;
     }
+
     public Error(...args: any): Logger {
+        console.error("[error", this.getNowTime(), "]", ...args);
         return this;
     }
+
     public Fatal(...args: any): Logger {
+        console.error("[fatal", this.getNowTime(), "]", ...args);
         return this;
     }
 }

src/mooc/chaoxing/course.ts

@@ -1,9 +1,8 @@
-import { Mooc, MoocFactory } from "../factory";
-import { TaskFactory, Task } from "./task";
-import { Application } from "@App/internal/application";
-import { VideoFactory } from "./video";
-import { TopicFactory, HomeworkTopicFactory, ExamTopicFactory } from "./topic";
-import { substrex } from "@App/internal/utils/utils";
+import {Mooc} from "../factory";
+import {Application} from "@App/internal/application";
+import {substrex} from "@App/internal/utils/utils";
+import {Task} from "@App/mooc/chaoxing/task";
+import {TaskFactory} from "@App/mooc/chaoxing/factory";
 
 //课程任务
 export class CxCourse implements Mooc {
@@ -33,41 +32,31 @@ export class CxCourse implements Mooc {
                 return;
             }
             let task: Task;
-            let taskFactory: TaskFactory;
-            switch (value.type) {
-                case "video": {
-                    taskFactory = new VideoFactory();
-                    break;
-                }
-                case "workid": {
-                    taskFactory = new TopicFactory();
-                    break;
-                }
-                default:
-                    return;
+            task = TaskFactory.CreateCourseTask(iframeWindow, value);
+            if (!task) {
+                return;
             }
-            task = taskFactory.CreateTask(iframeWindow, value);
             task.jobIndex = index;
             this.taskList.push(task);
             let taskIndex = this.taskList.length - 1;
             task.Load(() => {
                 if (++loadOverNum == this.taskList.length) {
-                    this.startTask(0);
+                    this.startTask(0, null);
                 }
             });
-            task.Complete(() => {
-                this.startTask(taskIndex + 1);
+            task.Complete(async () => {
+                this.startTask(taskIndex + 1, task);
             });
             task.Init();
         });
         Application.App.log.Debug("任务点参数", this.attachments);
         if (this.taskList.length == 0) {
             //无任务点
-            this.startTask(0);
+            this.startTask(0, null);
         }
     }
 
-    protected startTask(index: number) {
+    protected async startTask(index: number, nowtask: Task) {
         if (Application.App.config.auto) {
             //选择未完成的任务点开始
             let task: Task;
@@ -77,14 +66,15 @@ export class CxCourse implements Mooc {
                     if (index == 0) {
                         task.Start();
                     } else {
-                        this.delay(() => {
+                        this.delay(async () => {
+                            nowtask && await nowtask.Submit();
                             task.Start();
                         });
                     }
                     return;
                 }
             }
-            this.nextPage();
+            this.nextPage(null, nowtask);
         }
     }
 
@@ -108,9 +98,12 @@ export class CxCourse implements Mooc {
         return null;
     }
 
-    protected nextPage(num?: number) {
-        if (num == undefined) {
-            return this.delay(() => { this.nextPage(0); });
+    protected nextPage(num: number, task: Task) {
+        if (num == null) {
+            return this.delay(async () => {
+                task && await task.Submit();
+                this.nextPage(0, null);
+            });
         }
         let el = <HTMLElement>document.querySelector("span.currents ~ span");
         if (el != undefined) {
@@ -129,7 +122,8 @@ export class CxCourse implements Mooc {
                     Application.App.log.Fatal("被锁卡住了,请手动处理");
                     return alert("被锁卡住了,请手动处理");
                 }
-                this.nextPage(num + 1);
+                Application.App.log.Info("等待解锁");
+                this.nextPage(num + 1, null);
             }, 5000);
         }
         (<any>el.parentElement.querySelector("a>span")).click();
@@ -140,8 +134,7 @@ export class CxCourse implements Mooc {
 export class CxExamTopic implements Mooc {
     public Start(): void {
         window.onload = () => {
-            let topic = new ExamTopicFactory();
-            let task = topic.CreateTask(window, {
+            let task = TaskFactory.CreateExamTopicTask(window, {
                 refer: document.URL,
                 id: (<HTMLInputElement>document.querySelector("#paperId")).value,
             });
@@ -158,8 +151,7 @@ export class CxExamTopic implements Mooc {
 export class CxHomeWork implements Mooc {
     public Start(): void {
         window.onload = () => {
-            let topic = new HomeworkTopicFactory();
-            let task = topic.CreateTask(window, {
+            let task = TaskFactory.CreateHomeworkTopicTask(window, {
                 refer: document.URL,
                 id: substrex(document.URL, "&workId=", "&"),
                 info: (<HTMLInputElement>document.querySelector("#workLibraryId") || <HTMLInputElement>document.querySelector("#cid")).value
@@ -170,4 +162,4 @@ export class CxHomeWork implements Mooc {
             }
         }
     }
-}
+}