feat: Add support for base64 http/https subscribe links

feat: Add support for Trojan protocol
fix: duplicate short link in R2
fix: the route of clash config

Author: 7Sageer

README.md

@@ -1,6 +1,6 @@
 # Sublink Worker
 
-这是一个可部署在Cloudflare Worker的轻量级订阅转换工具，用于将各种代理协议的订阅链接转换为不同客户端可用的配置格式。
+这是一个可部署在Cloudflare Worker的轻量级订阅转换工具，用于将各种代理协议的分享url转换为不同客户端可用的订阅链接。
 
 ![image](/doc/image.png)
 
@@ -9,14 +9,26 @@
 
 ## 功能特点
 
-- 支持协议：SS、VMess、VLESS、Hysteria2
+- 支持协议：SS、VMess、VLESS、Hysteria2、Trojan
+- 支持从其他base64订阅链接获取分享url
 - 支持客户端：
   - Sing-Box
   - Clash
   - XRay/V2Ray
 - 提供Web界面用于便捷操作
 - 支持短链接生成（基于R2）
 - 浅色/深色主题切换
+- **新功能：支持 HTTP/HTTPS 的 Base64 订阅链接**
+- **新功能：支持 Trojan 协议**
+- **各种优化和性能提升**
+
+## 最近更新（7.28）
+
+我很高兴宣布以下新功能和改进：
+
+1. 新增对 HTTP/HTTPS 的 Base64 订阅链接的支持
+2. 新增对 Trojan 协议的支持
+3. 优化了页面引导和整体性能
 
 ## 部署
 

src/ClashConfigBuilder.js

@@ -4,21 +4,38 @@ import { CLASH_CONFIG, SELECTORS_LIST } from './config.js';
 import { DeepCopy } from './utils.js';
 
 export class ClashConfigBuilder {
-	constructor(inputString) {
-		this.inputString = inputString;
-		this.config = DeepCopy(CLASH_CONFIG);
-	}
+    constructor(inputString) {
+        this.inputString = inputString;
+        this.config = DeepCopy(CLASH_CONFIG);
+    }
 
-	async build() {
-		const customProxies = await this.parseCustomProxies();
-		this.addCustomProxies(customProxies);
-		return yaml.dump(this.config);
-	}
+    async build() {
+        const customProxies = await this.parseCustomProxies();
+        this.addCustomProxies(customProxies);
+        return yaml.dump(this.config);
+    }
 
-	async parseCustomProxies() {
-		const urls = this.inputString.split('\n').filter(url => url.trim() !== '');
-		return Promise.all(urls.map(url => ProxyParser.parse(url)));
-	}
+    async parseCustomProxies() {
+        const urls = this.inputString.split('\n').filter(url => url.trim() !== '');
+        const parsedProxies = [];
+
+        for (const url of urls) {
+            const result = await ProxyParser.parse(url);
+            if (Array.isArray(result)) {
+                // If the result is an array, it's from an HTTP(S) source
+                for (const subUrl of result) {
+                    const subResult = await ProxyParser.parse(subUrl);
+                    if (subResult) {
+                        parsedProxies.push(subResult);
+                    }
+                }
+            } else if (result) {
+                parsedProxies.push(result);
+            }
+        }
+
+        return parsedProxies;
+    }
 
 	addCustomProxies(customProxies) {
 		customProxies.forEach(proxy => {
@@ -27,6 +44,7 @@ export class ClashConfigBuilder {
             }
 		});
 		const proxyList = customProxies.filter(proxy => proxy?.tag !== undefined).map(proxy => proxy?.tag);
+		proxyList.push('DIRECT', 'REJECT');
 		SELECTORS_LIST.forEach(selector => {
 			if (!this.config['proxy-groups'].some(g => g.name === selector)) {
 				this.config['proxy-groups'].push({
@@ -38,76 +56,102 @@ export class ClashConfigBuilder {
 		});
 	}
 
-	convertToClashProxy(proxy) {
-		// Convert sing-box proxy format to Clash format
-		switch(proxy.type) {
-			case 'shadowsocks':
-				return {
-					name: proxy.tag,
-					type: 'ss',
-					server: proxy.server,
-					port: proxy.server_port,
-					cipher: proxy.method,
-					password: proxy.password
-				};
-			case 'vmess':
-				return {
-					name: proxy.tag,
-					type: proxy.type,
-					server: proxy.server,
-					port: proxy.server_port,
-					uuid: proxy.uuid,
-					alterId: proxy.alter_id,
-					cipher: proxy.security,
-					tls: proxy.tls?.enabled || false,
-					servername: proxy.tls?.server_name || '',
-					network: proxy.transport?.type || 'tcp',
-					'ws-opts': proxy.transport?.type === 'ws' ? {
-						path: proxy.transport.path,
-						headers: proxy.transport.headers
-					} : undefined
-				};
-			case 'vless':
-				return {
-					name: proxy.tag,
-					type: proxy.type,
-					server: proxy.server,
-					port: proxy.server_port,
-					uuid: proxy.uuid,
-					cipher: proxy.security,
-					tls: proxy.tls?.enabled || false,
-                    'client-fingerprint':proxy.tls.utls?.fingerprint,
-					servername: proxy.tls?.server_name || '',
-					network: proxy.transport?.type || 'tcp',
-					'ws-opts': proxy.transport?.type === 'ws' ? {
-						path: proxy.transport.path,
-						headers: proxy.transport.headers
-					}: undefined,
-					'reality-opts': proxy.tls.reality?.enabled ? {
-						'public-key': proxy.tls.reality.public_key,
-						'short-id': proxy.tls.reality.short_id,
-					} : undefined,
+    convertToClashProxy(proxy) {
+        switch(proxy.type) {
+            case 'shadowsocks':
+                return {
+                    name: proxy.tag,
+                    type: 'ss',
+                    server: proxy.server,
+                    port: proxy.server_port,
+                    cipher: proxy.method,
+                    password: proxy.password
+                };
+            case 'vmess':
+                return {
+                    name: proxy.tag,
+                    type: proxy.type,
+                    server: proxy.server,
+                    port: proxy.server_port,
+                    uuid: proxy.uuid,
+                    alterId: proxy.alter_id,
+                    cipher: proxy.security,
+                    tls: proxy.tls?.enabled || false,
+                    servername: proxy.tls?.server_name || '',
+                    network: proxy.transport?.type || 'tcp',
+                    'ws-opts': proxy.transport?.type === 'ws' ? {
+                        path: proxy.transport.path,
+                        headers: proxy.transport.headers
+                    } : undefined
+                };
+            case 'vless':
+                return {
+                    name: proxy.tag,
+                    type: proxy.type,
+                    server: proxy.server,
+                    port: proxy.server_port,
+                    uuid: proxy.uuid,
+                    cipher: proxy.security,
+                    tls: proxy.tls?.enabled || false,
+                    'client-fingerprint': proxy.tls.utls?.fingerprint,
+                    servername: proxy.tls?.server_name || '',
+                    network: proxy.transport?.type || 'tcp',
+                    'ws-opts': proxy.transport?.type === 'ws' ? {
+                        path: proxy.transport.path,
+                        headers: proxy.transport.headers
+                    }: undefined,
+                    'reality-opts': proxy.tls.reality?.enabled ? {
+                        'public-key': proxy.tls.reality.public_key,
+                        'short-id': proxy.tls.reality.short_id,
+                    } : undefined,
                     'grpc-opts': proxy.transport?.type === 'grpc' ? {
                         'grpc-mode': 'gun',
                         'grpc-service-name': proxy.transport.service_name,
                     } : undefined,
                     tfo : proxy.tcp_fast_open,
                     'skip-cert-verify': proxy.tls.insecure,
                     'flow': proxy.flow ?? undefined,
-				};
-			case 'hysteria2':
+                };
+            case 'hysteria2':
+                return {
+                    name: proxy.tag,
+                    type: proxy.type,
+                    server: proxy.server,
+                    port: proxy.server_port,
+                    password: proxy.password,
+                    auth: proxy.password,
+                    'skip-cert-verify': proxy.tls.insecure,
+                };
+			case 'trojan':
 				return {
-					name: proxy.tag,
-					type: proxy.type,
-					server: proxy.server,
-					port: proxy.server_port,
-					password: proxy.password,
-					auth: proxy.password,
-					'skip-cert-verify': proxy.tls.insecure,
-				};
-					
-			default:
-				return proxy; // Return as-is if no specific conversion is defined
-	    }
-	}
-}
+                    name: proxy.tag,
+                    type: proxy.type,
+                    server: proxy.server,
+                    port: proxy.server_port,
+                    password: proxy.password,
+                    cipher: proxy.security,
+                    tls: proxy.tls?.enabled || false,
+                    'client-fingerprint': proxy.tls.utls?.fingerprint,
+                    servername: proxy.tls?.server_name || '',
+                    network: proxy.transport?.type || 'tcp',
+                    'ws-opts': proxy.transport?.type === 'ws' ? {
+                        path: proxy.transport.path,
+                        headers: proxy.transport.headers
+                    }: undefined,
+                    'reality-opts': proxy.tls.reality?.enabled ? {
+                        'public-key': proxy.tls.reality.public_key,
+                        'short-id': proxy.tls.reality.short_id,
+                    } : undefined,
+                    'grpc-opts': proxy.transport?.type === 'grpc' ? {
+                        'grpc-mode': 'gun',
+                        'grpc-service-name': proxy.transport.service_name,
+                    } : undefined,
+                    tfo : proxy.tcp_fast_open,
+                    'skip-cert-verify': proxy.tls.insecure,
+                    'flow': proxy.flow ?? undefined,
+				}
+            default:
+                return proxy; // Return as-is if no specific conversion is defined
+        }
+    }
+}

src/ProxyParsers.js

@@ -1,4 +1,4 @@
-import { parseServerInfo, parseUrlParams, createTlsConfig, createTransportConfig } from './utils.js';
+import { parseServerInfo, parseUrlParams, createTlsConfig, createTransportConfig, decodeBase64 } from './utils.js';
 
 
 export class ProxyParser {
@@ -8,7 +8,9 @@ export class ProxyParser {
 			case 'ss': return new ShadowsocksParser().parse(url);
 			case 'vmess': return new VmessParser().parse(url);
 			case 'vless': return new VlessParser().parse(url);
-            case 'hysteria2': return new Hysteria2Parser().parse(url);
+      case 'hysteria2': return new Hysteria2Parser().parse(url);
+      case 'http' || 'https': return HttpParser.parse(url);
+      case 'trojan': return new TrojanParser().parse(url);
 		}
 	}
 	}
@@ -132,3 +134,50 @@ export class ProxyParser {
           };
         }
       }
+
+      class TrojanParser {
+        parse(url) {
+          // trojan://8jxfHkRdEV@diylink.qhr.icu:31190?security=reality&sni=yahoo.com&fp=random&pbk=KlaUGzBvKlBX0GqI7hCPioRZvDuLP3O5wozg-L8nCiw&sid=a9d30b07&spx=%2F&type=tcp&headerType=none#trojan-test-nuu4xgxm
+          const { addressPart, params, name } = parseUrlParams(url);
+          const [password, serverInfo] = addressPart.split('@');
+          const { host, port } = parseServerInfo(serverInfo);
+
+          const parsedURL = parseServerInfo(addressPart);
+          const tls = createTlsConfig(params);
+          const transport = params.type !== 'tcp' ? createTransportConfig(params) : undefined;
+          return {
+            type: 'trojan',
+            tag: name,
+            server: host,
+            server_port: port,
+            password: password || parsedURL.username,
+            network: "tcp",
+            tcp_fast_open: false,
+            tls: tls,
+            transport: transport,
+            flow: params.flow ?? undefined
+          };
+        }
+      }
+        // 
+      class HttpParser {
+        static async parse(url) {
+            try {
+                const response = await fetch(url);
+                if (!response.ok) {
+                    throw new Error(`HTTP error! status: ${response.status}`);
+                }
+                const text = await response.text();
+                let decodedText;
+                try {
+                    decodedText = decodeBase64(text.trim());
+                } catch (e) {
+                    decodedText = text;
+                }
+                return decodedText.split('\n').filter(line => line.trim() !== '');
+            } catch (error) {
+                console.error('Error fetching or parsing HTTP(S) content:', error);
+                return null;
+            }
+        }
+    }