chore: 增加上传同步配置的详细日志

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.14.256",
+  "version": "2.14.258",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
   "main": "src/main.js",
   "scripts": {

backend/src/core/rule-utils/parsers.js

@@ -39,8 +39,7 @@ function AllRuleParser() {
                             content: params[1],
                         };
                         if (
-                            rule.type === 'IP-CIDR' ||
-                            rule.type === 'IP-CIDR6'
+                            ['IP-CIDR', 'IP-CIDR6', 'GEOIP'].includes(rule.type)
                         ) {
                             rule.options = params.slice(2);
                         }

backend/src/core/rule-utils/producers.js

@@ -10,6 +10,8 @@ function QXFilter() {
             'SRC-IP',
             'IN-PORT',
             'PROTOCOL',
+            'GEOSITE',
+            'GEOIP',
         ];
         if (UNSUPPORTED.indexOf(rule.type) !== -1) return null;
 
@@ -29,6 +31,8 @@ function QXFilter() {
 function SurgeRuleSet() {
     const type = 'SINGLE';
     const func = (rule) => {
+        const UNSUPPORTED = ['GEOSITE', 'GEOIP'];
+        if (UNSUPPORTED.indexOf(rule.type) !== -1) return null;
         let output = `${rule.type},${rule.content}`;
         if (['IP-CIDR', 'IP-CIDR6'].includes(rule.type)) {
             output +=
@@ -43,7 +47,7 @@ function LoonRules() {
     const type = 'SINGLE';
     const func = (rule) => {
         // skip unsupported rules
-        const UNSUPPORTED = ['DEST-PORT', 'SRC-IP', 'IN-PORT', 'PROTOCOL'];
+        const UNSUPPORTED = ['SRC-IP', 'GEOSITE', 'GEOIP'];
         if (UNSUPPORTED.indexOf(rule.type) !== -1) return null;
         if (['IP-CIDR', 'IP-CIDR6'].includes(rule.type) && rule.options) {
             // Loon only supports the no-resolve option
@@ -69,7 +73,7 @@ function ClashRuleProvider() {
                 let output = `${TRANSFORM[rule.type] || rule.type},${
                     rule.content
                 }`;
-                if (['IP-CIDR', 'IP-CIDR6'].includes(rule.type)) {
+                if (['IP-CIDR', 'IP-CIDR6', 'GEOIP'].includes(rule.type)) {
                     if (rule.options) {
                         // Clash only supports the no-resolve option
                         rule.options = rule.options.filter((option) =>

backend/src/products/cron-sync-artifacts.js

@@ -128,10 +128,19 @@ async function doSync() {
                         files.map((item) => [item.path, item]),
                     );
                 }
-                const url = files[encodeURIComponent(artifact.name)]?.raw_url;
-                artifact.url = isGitLab
-                    ? url
-                    : url?.replace(/\/raw\/[^/]*\/(.*)/, '/raw/$1');
+                const raw_url =
+                    files[encodeURIComponent(artifact.name)]?.raw_url;
+                const new_url = isGitLab
+                    ? raw_url
+                    : raw_url?.replace(/\/raw\/[^/]*\/(.*)/, '/raw/$1');
+                $.info(
+                    `上传配置完成\n文件列表: ${Object.keys(files).join(
+                        ', ',
+                    )}\n当前文件: ${encodeURIComponent(
+                        artifact.name,
+                    )}\n响应返回的原始链接: ${raw_url}\n处理完的新链接: ${new_url}`,
+                );
+                artifact.url = new_url;
             }
         }
 

backend/src/restful/download.js

@@ -79,8 +79,7 @@ async function downloadSubscription(req, res) {
 
             if (
                 sub.source !== 'local' ||
-                ['localFirst', 'remoteFirst'].includes(sub.mergeSources) ||
-                url
+                ['localFirst', 'remoteFirst'].includes(sub.mergeSources)
             ) {
                 try {
                     url = `${url || sub.url}`

backend/src/restful/sync.js

@@ -563,10 +563,19 @@ async function syncArtifacts() {
                         files.map((item) => [item.path, item]),
                     );
                 }
-                const url = files[encodeURIComponent(artifact.name)]?.raw_url;
-                artifact.url = isGitLab
-                    ? url
-                    : url?.replace(/\/raw\/[^/]*\/(.*)/, '/raw/$1');
+                const raw_url =
+                    files[encodeURIComponent(artifact.name)]?.raw_url;
+                const new_url = isGitLab
+                    ? raw_url
+                    : raw_url?.replace(/\/raw\/[^/]*\/(.*)/, '/raw/$1');
+                $.info(
+                    `上传配置完成\n文件列表: ${Object.keys(files).join(
+                        ', ',
+                    )}\n当前文件: ${encodeURIComponent(
+                        artifact.name,
+                    )}\n响应返回的原始链接: ${raw_url}\n处理完的新链接: ${new_url}`,
+                );
+                artifact.url = new_url;
             }
         }
 
@@ -660,10 +669,18 @@ async function syncArtifact(req, res) {
             isGitLab = true;
             files = Object.fromEntries(files.map((item) => [item.path, item]));
         }
-        const url = files[encodeURIComponent(artifact.name)]?.raw_url;
-        artifact.url = isGitLab
-            ? url
-            : url?.replace(/\/raw\/[^/]*\/(.*)/, '/raw/$1');
+        const raw_url = files[encodeURIComponent(artifact.name)]?.raw_url;
+        const new_url = isGitLab
+            ? raw_url
+            : raw_url?.replace(/\/raw\/[^/]*\/(.*)/, '/raw/$1');
+        $.info(
+            `上传配置完成\n文件列表: ${Object.keys(files).join(
+                ', ',
+            )}\n当前文件: ${encodeURIComponent(
+                artifact.name,
+            )}\n响应返回的原始链接: ${raw_url}\n处理完的新链接: ${new_url}`,
+        );
+        artifact.url = new_url;
         $.write(allArtifacts, ARTIFACTS_KEY);
         success(res, artifact);
     } catch (err) {