feat: 支持转换 surge ip-cidr6 至 quantumult x ip6-cidr

surgioproject · May 5, 2020 · c823677 · c823677
1 parent 1e51415
commit c823677
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/lib/generator/__tests__/template.test.ts b/lib/generator/__tests__/template.test.ts
@@ -87,12 +87,19 @@ test('base64', t => {
 
 test('quantumultx filter 1', t => {
   const body = `{{ str | quantumultx }}`;
-  const str = `PROCESS-NAME,Telegram,Proxy,no-resolve // test rule`;
-  const result = templateEngine.renderString(body, {
-    str,
-  });
 
-  t.is(result, '');
+  t.is(
+    templateEngine.renderString(body, {
+      str: `PROCESS-NAME,Telegram,Proxy,no-resolve // test rule`,
+    }),
+    ''
+  );
+  t.is(
+    templateEngine.renderString(body, {
+      str: 'IP-CIDR6, 2001:4860:4860::8888/32, DIRECT',
+    }),
+    'IP6-CIDR, 2001:4860:4860::8888/32, DIRECT'
+  );
 });
 
 test('quantumultx filter 2', t => {

diff --git a/lib/generator/template.ts b/lib/generator/template.ts
@@ -72,6 +72,10 @@ export function getEngine(templateDir: string): nunjucks.Environment {
           matched &&
           QUANTUMULT_X_SUPPORTED_RULE.some(s => matched[1] === s)
         ) {
+          if (matched[1] === 'IP-CIDR6') {
+            return item.replace(/IP-CIDR6/i, 'IP6-CIDR');
+          }
+
           // 过滤出支持的规则类型
           return item;
         }

diff --git a/lib/utils/constant.ts b/lib/utils/constant.ts
@@ -33,6 +33,7 @@ export const QUANTUMULT_X_SUPPORTED_RULE: ReadonlyArray<string> = [
   'DOMAIN-SUFFIX',
   'DOMAIN-KEYWORD',
   'IP-CIDR',
+  'IP-CIDR6',
   'GEOIP',
   'FINAL',
 ];