From 4c185bfd29c4c4b1ef0cd371ff5936d113be29da Mon Sep 17 00:00:00 2001
From: Shawn <45581750+KOP-XIAO@users.noreply.github.com>
Date: Thu, 18 Mar 2021 18:12:52 +0800
Subject: [PATCH] minor fix

---
 .DS_Store                  | Bin 12292 -> 12292 bytes
 Scripts/resource-parser.js |  12 +++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 16b8afc5f4db44fe306e7dee440b259fc0a05982..e5bf88f06fbb4993310415e368a6e008e1541688 100644
GIT binary patch
delta 82
zcmZokXi3=cRGjhnWHrVHb+PJd104l(vsxX6YC|&%AluT!vbL6!LtNF+)-xfuvZ}hK
jwr=|5bBywgGd8c0h-2T(t#FH-@%ZLv>i>Zh&=5HQVUiod

delta 81
zcmZokXi3=cRGjhHWHrVHHPPy7104km(^?&cY6}w})6&GCww9AaT-DIlGa<LKs=B7O
iZrbE?jPi`rH?Nh5W8ciBaGRa+*yd;I|A7?H3^@Qw=No_k

diff --git a/Scripts/resource-parser.js b/Scripts/resource-parser.js
index 87ba012..1dfcb84 100644
--- a/Scripts/resource-parser.js
+++ b/Scripts/resource-parser.js
@@ -1,5 +1,5 @@
 /** 
-☑️ 资源解析器 ©𝐒𝐡𝐚𝐰𝐧  ⟦2021-03-14 13:59⟧
+☑️ 资源解析器 ©𝐒𝐡𝐚𝐰𝐧  ⟦2021-03-18 19:59⟧
 ----------------------------------------------------------
 🛠 发现 𝐁𝐔𝐆 请反馈: @Shawn_KOP_bot
 ⛳️ 关注 🆃🅶 相关频道: https://t.me/QuanX_API
@@ -222,12 +222,12 @@ function ResourceParse() {
   } else if (type0 == "sgmodule") { // surge module 模块/含 url-regex 的 rule-set
     flag = 2 
     total = SGMD2QX(content0) // 转换 
-    total = Rewrite_Filter(total, Pin0, Pout0); // 筛选过滤
+    total = Rewrite_Filter(total, Pin0, Pout0,Preg); // 筛选过滤
     if (Preplace) { total = ReplaceReg(total, Preplace) }
     total = total.join("\n")
   } else if (type0 == "rewrite") { // rewrite 类型
     flag = 2;
-    total = Rewrite_Filter(isQuanXRewrite(content0.split("\n")), Pin0, Pout0);
+    total = Rewrite_Filter(isQuanXRewrite(content0.split("\n")), Pin0, Pout0,Preg);
     if (Preplace) { total = ReplaceReg(total, Preplace) }
     total = total.join("\n")
   } else if (type0 == "Rule") {  // rule 类型, 已处理完毕
@@ -688,7 +688,7 @@ function SGMD2QX(subs) {
 }
 
 //Rewrite过滤，使用+连接多个关键词(逻辑"或"):in 为保留，out 为排除
-function Rewrite_Filter(subs, Pin, Pout) {
+function Rewrite_Filter(subs, Pin, Pout,Preg) {
     var Nlist = [];
     var noteK = ["//", "#", ";"];
     var hnc = 0;
@@ -697,7 +697,7 @@ function Rewrite_Filter(subs, Pin, Pout) {
     for (var i = 0; i < subs.length; i++) {
         subi = subs[i].trim();
         var subii = subi.replace(/ /g, "")
-        if (subi != "") {
+        if (subi != "" && subi.indexOf(" url ")!=-1) {
             const notecheck = (item) => subi.indexOf(item) == 0
             if (noteK.some(notecheck)) { // 注释项跳过 
                 continue;
@@ -1166,6 +1166,8 @@ function Pobfs(jsonl, Pcert, Ptls13) {
         return obfsi.join(", ")
     } else if(jsonl.net !="tcp"){ // 过滤掉 h2/http 等类型
       return "NOT-SUPPORTTED"
+    } else if(jsonl.net =="tcp" && jsonl.type != "none") {
+      return "NOT-SUPPORTTED"
     } else {return ""}
 }