支持CAT_click & 修复油猴脚本问题 & fix: #219 #218

Author: CodFrm

package.json

@@ -4,13 +4,13 @@
   "description": "一个 大学生网课 学习工具,火狐,谷歌,油猴支持.全自动任务,视频倍速秒过,作业考试题库,验证码自动打码(੧ᐛ੭挂科模式,启动)",
   "main": "mooc.js",
   "scripts": {
-    "test": "node_modules/.bin/jest",
-    "build": "node_modules/.bin/webpack --mode production --config webpack.config.js",
-    "tampermonkey": "node_modules/.bin/webpack --mode development --config webpack.tampermonkey.js",
-    "dev": "node_modules/.bin/webpack --mode development --config webpack.dev.js",
-    "pack": "node_modules/.bin/tsc src/internal/pack-crx.ts && node src/internal/pack-crx.js",
-    "docs:dev": "node_modules/.bin/vuepress dev docs",
-    "docs:build": "node_modules/.bin/vuepress build docs"
+    "test": "jest",
+    "build": "webpack --mode production --config webpack.config.js",
+    "tampermonkey": "webpack --mode development --config webpack.tampermonkey.js",
+    "dev": "webpack --mode development --config webpack.dev.js",
+    "pack": "tsc src/internal/pack-crx.ts && node src/internal/pack-crx.js",
+    "docs:dev": "vuepress dev docs",
+    "docs:build": "vuepress build docs"
   },
   "repository": {
     "type": "git",

src/internal/utils/config.ts

@@ -1,6 +1,6 @@
-import {boolToString, randNumber, toBool} from "./utils";
-import {Application} from "../application";
-import {SystemConfig} from "@App/config";
+import { boolToString, randNumber, toBool } from "./utils";
+import { Application } from "../application";
+import { SystemConfig } from "@App/config";
 
 export interface ConfigItems extends Config {
     SetNamespace(namespace: string): void
@@ -222,7 +222,7 @@ class backendConfig implements Config {
     // 更新配置转为json,存入
     protected updateConfigStorage() {
         let txt = JSON.stringify(this.cache);
-        chrome.storage.sync.set({"config_storage": txt});
+        chrome.storage.sync.set({ "config_storage": txt });
     }
 
     // 更新缓存
@@ -240,7 +240,7 @@ class backendConfig implements Config {
                     }
                 });
                 this.updateConfigStorage();
-                resolve();
+                resolve(undefined);
             });
         });
     }
@@ -263,12 +263,12 @@ class backendConfig implements Config {
             info[key] = val;
             //通知前端和后端
             this.cache[key] = val;
-            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 });
             });
-            chrome.runtime.sendMessage({type: "cxconfig", key: key, value: val});
+            chrome.runtime.sendMessage({ type: "cxconfig", key: key, value: val });
             this.updateConfigStorage();
-            resolve();
+            resolve(undefined);
         });
     }
 
@@ -295,7 +295,7 @@ class frontendGetConfig implements Config {
 
     constructor() {
         this.watch = new configWatch();
-        this.cache = (<any>window).configData;
+        this.cache = (<any>window).configData || localStorage;
         window.addEventListener('message', (event) => {
             if (event.data.type && event.data.type == "cxconfig") {
                 Application.App.log.Info("配置更新:" + event.data.key + "=" + event.data.value);
@@ -322,7 +322,7 @@ class frontendGetConfig implements Config {
             return (<any>window).GM_setValue(key, val);
         }
         return Application.App.Client.Send({
-            type: "GM_setValue", details: {key: key, val: val},
+            type: "GM_setValue", details: { key: key, val: val },
         });
     }
 

src/internal/utils/log.ts

@@ -138,8 +138,25 @@ export class PageLog implements Logger {
                 return parseInt(window.getComputedStyle(ele)[prop]);
             }
 
-            this.div.style.left = Application.App.config.GetConfig("notify_tools_x");
-            this.div.style.top = Application.App.config.GetConfig("notify_tools_y");
+            const windowWidth = window.innerWidth;
+            const windowHeight = window.innerHeight;
+            const containerWidth = getProperty(this.div, "width");
+            const containerHeight = getProperty(this.div, "height");
+            let x = parseInt(Application.App.config.GetConfig("notify_tools_x").replace('px', ''));
+            if (x < 0) {
+                x = 0;
+            }
+            if (x >= windowWidth - containerWidth)
+                x = windowWidth - containerWidth;
+            this.div.style.left = x + "px";
+            let y = parseInt(Application.App.config.GetConfig("notify_tools_y").replace('px', ''));
+            if (y < 0) {
+                y = 0;
+            }
+            if (y >= windowHeight - containerHeight)
+                y = windowHeight - containerHeight;
+            this.div.style.top = y + "px";
+
             let head = <HTMLElement>this.div.querySelector("#tools-head");
             head.onmousedown = (downEvent) => {
                 let relaX = downEvent.clientX - this.div.offsetLeft;

src/internal/utils/utils.ts

@@ -419,6 +419,10 @@ export function boolToString(val: boolean): string {
 }
 
 export function UntrustedClick(el: Element): boolean {
+    if (window.CAT_click != undefined) {
+        CAT_click(el);
+        return true;
+    }
     let untrusted = new MouseEvent("click", { "clientX": 10086 });
     if (!untrusted.isTrusted) {
         Application.App.log.Warn("扩展执行错误");

src/mooc/chaoxing/task.ts

@@ -1,7 +1,7 @@
-import {CssBtn} from "@App/mooc/chaoxing/utils";
-import {createBtn} from "@App/internal/utils/utils";
-import {Application} from "@App/internal/application";
-import {Task, TaskEvent} from "@App/internal/app/task";
+import { CssBtn } from "@App/mooc/chaoxing/utils";
+import { createBtn, get } from "@App/internal/utils/utils";
+import { Application } from "@App/internal/application";
+import { Task, TaskEvent } from "@App/internal/app/task";
 
 export abstract class CxTask extends Task {
     public jobIndex: number;
@@ -96,7 +96,13 @@ export class CxTaskControlBar {
         let download = CssBtn(createBtn("下载资源", "我要下载下来好好学习", "cx-btn"));
         download.style.background = "#999999";
         download.onclick = () => {
-            window.open("http://d0.ananas.chaoxing.com/download/" + this.task.taskinfo.property.objectid);
+            (<any>get("https://mooc1-1.chaoxing.com/ananas/status/" + this.task.taskinfo.property.objectid, (data: string) => {
+                let json = JSON.parse(data);
+                prompt("如果打开下载失败，请复制下面链接手动下载", json.download);
+                window.open(json.download);
+            })).error(() => {
+                alert("资源信息获取失败");
+            });
         };
         return download;
     }

src/tampermonkey/course163.js

@@ -9,6 +9,7 @@
 // @match        *://www.icourse163.org/spoc/learn/*
 // @grant        GM_xmlhttpRequest
 // @grant        GM_notification
+// @grant        CAT_click
 // @grant        unsafeWindow
 // @license      MIT
 // ==/UserScript==

src/tools.d.ts

@@ -0,0 +1,3 @@
+
+declare function CAT_click(el: Element): void;
+