基本实现完成GM API

Author: CodFrm

example/gm_cookie.js

@@ -1,5 +1,5 @@
 // ==UserScript==
-// @name         New Userscript
+// @name         GM cookie操作
 // @namespace    https://bbs.tampermonkey.net.cn/
 // @version      0.1.0
 // @description  可以控制浏览器的cookie, 必须指定@connect, 并且每次一个新的域调用都需要用户确定
@@ -9,8 +9,6 @@
 // @connect example.com
 // ==/UserScript==
 
-// GM_cookie("store") 方法请看storage_name/gm_value.js的例子, 可用于隐身窗口的操作
-
 GM_cookie("set", {
     url: "http://example.com/cookie",
     name: "cookie1", value: "value"

example/gm_download.js

@@ -9,7 +9,7 @@
 // ==/UserScript==
 
 GM_download({
-    url: "https://scriptcat.org/api/v1/gm_crx/download/ScriptCat",
+    url: "https://scriptcat.org/api/v2/open/crx-download/ndcooeababalnlpkfedmmbbbgkljhpjf",
     name: "scriptcat.crx",
     headers: {
         "referer": "http://www.example.com/",

example/gm_value/gm_value_2.js

@@ -13,13 +13,8 @@
 // @storageName example
 // ==/UserScript==
 
-GM_addValueChangeListener("test_set", function (name, oldval, newval, remote, tabid) {
-  console.log("test_set change", name, oldval, newval, remote, tabid);
-  // 可以通过tabid获取到触发变化的tab
-  // GM_cookie.store可以获取到对应的cookie storeId
-  GM_cookie("store", tabid, (storeId) => {
-    console.log("store", storeId);
-  });
+GM_addValueChangeListener("test_set", function (name, oldval, newval, remote) {
+  console.log("test_set change", name, oldval, newval, remote);
 });
 
 setInterval(() => {

example/gm_value/gm_value_2_bg.js

@@ -14,13 +14,8 @@
 // ==/UserScript==
 
 return new Promise((resolve) => {
-  GM_addValueChangeListener("test_set", function (name, oldval, newval, remote, tabid) {
-    console.log("value change", name, oldval, newval, remote, tabid);
-    // 可以通过tabid获取到触发变化的tab
-    // GM_cookie.store可以获取到对应的cookie storeId
-    GM_cookie("store", tabid, (storeId) => {
-      console.log("store", storeId);
-    });
+  GM_addValueChangeListener("test_set", function (name, oldval, newval, remote) {
+    console.log("value change", name, oldval, newval, remote);
   });
 
   setInterval(() => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "scriptcat",
-  "version": "0.17.0-alpha.2",
+  "version": "0.17.0-alpha.1",
   "description": "脚本猫,一个可以执行用户脚本的浏览器扩展,万物皆可脚本化,让你的浏览器可以做更多的事情!",
   "author": "CodFrm",
   "license": "GPLv3",

packages/message/client.ts

@@ -6,9 +6,9 @@ export async function sendMessage(msg: MessageSend, action: string, data?: any):
   LoggerCore.getInstance().logger().trace("sendMessage", { action, data, response: res });
   if (res && res.code) {
     console.error(res);
-    return Promise.reject(res.message);
+    throw res.message;
   } else {
-    return Promise.resolve(res.data);
+    return res.data;
   }
 }
 

packages/message/server.ts

@@ -138,20 +138,7 @@ export function forwardMessage(
   to: MessageSend,
   middleware?: ApiFunctionSync
 ) {
-  from.on(path, (params, fromCon) => {
-    if (middleware) {
-      // 此处是为了处理CustomEventMessage的同步消息情况
-      const resp = middleware(params, fromCon) as any;
-      if (resp instanceof Promise) {
-        return resp.then((data) => {
-          if (data !== false) {
-            return data;
-          }
-        });
-      } else if (resp !== false) {
-        return resp;
-      }
-    }
+  const handler = (params: any, fromCon: GetSender) => {
     const fromConnect = fromCon.getConnect();
     if (fromConnect) {
       connect(to, prefix + "/" + path, params).then((toCon) => {
@@ -171,5 +158,22 @@ export function forwardMessage(
     } else {
       return sendMessage(to, prefix + "/" + path, params);
     }
+  };
+  from.on(path, (params, sender) => {
+    if (middleware) {
+      // 此处是为了处理CustomEventMessage的同步消息情况
+      const resp = middleware(params, sender) as any;
+      if (resp instanceof Promise) {
+        return resp.then((data) => {
+          if (data !== false) {
+            return data;
+          }
+          return handler(params, sender);
+        });
+      } else if (resp !== false) {
+        return resp;
+      }
+      return handler(params, sender);
+    }
   });
 }

src/app/cache.ts

@@ -116,7 +116,7 @@ export default class Cache {
       ret = await set();
       this.set(key, ret);
     }
-    return Promise.resolve(ret);
+    return ret;
   }
 
   public set(key: string, value: any): Promise<void> {
@@ -173,8 +173,9 @@ export default class Cache {
         if (value) {
           newValue = value;
           return this.set(key, value);
+        } else if (value === undefined) {
+          return this.del(key);
         }
-        return Promise.resolve();
       });
     unlock();
     return newValue!;

src/app/repo/dao.ts

@@ -75,9 +75,9 @@ export abstract class DAO<T> {
     }
     const resp = await this.table.update(id, <any>val);
     if (resp) {
-      return Promise.resolve(id);
+      return id;
     }
-    return Promise.reject(ErrSaveError);
+    throw ErrSaveError;
   }
 
   public findById(id: number) {

src/app/service/content/content.ts

@@ -35,7 +35,7 @@ export default class ContentRuntime {
             setTimeout(() => {
               URL.revokeObjectURL(url);
             }, 60 * 1000);
-            return Promise.resolve(url);
+            return url;
           }
           case "CAT_fetchBlob": {
             return fetch(data.params[0]).then((res) => res.blob());
@@ -80,7 +80,7 @@ export default class ContentRuntime {
             return nodeId;
           }
         }
-        return Promise.resolve(false);
+        return false;
       }
     );
     const client = new Client(this.msg, "inject");