Commit Graph
100 Commits
Author SHA1 Message Date
Tindy X 6f721aec6d Update build scripts 2020-07-01 02:24:09 +08:00
Tindy X f9eba5b179 Update build scripts
Optimize codes.
2020-07-01 01:14:03 +08:00
Tindy X 5aa47c7cf2 Use internal MD5 calculation 2020-06-30 21:53:37 +08:00
Tindy X 3b58b04d63 Fix error in generated Clash scripts
Fix missing classical providers when exporting Clash rule-providers.
Fix not correctly process some rulesets when generating Clash scripts.
Fix typo in pref.ini.
2020-06-29 16:16:49 +08:00
Tindy X 8ad8048345 Fix User-Agent header not being correctly sent while fetching files 2020-06-29 00:12:24 +08:00
Tindy X 0bfed74e1f Fix crash when providing a folder name to fileGet 2020-06-28 23:22:12 +08:00
Tindy X 90724c26cf Fix potential crash when parsing broken Surge subscription
Optimize codes.
2020-06-27 12:47:22 +08:00
Tindy X c9e665801f Fix nullnode may cause crash when exporting Clash subscriptions 2020-06-26 00:03:42 +08:00
Tindy X d042f00a8e Enhancements
Fix not adding local rulesets as Clash rule-providers.
Add "nullnode" as node placeholder to export configurations without adding any real node.
Add support for using !!import in source subscription URLs.
Add support for allowInsecure and tfo argument in Trojan links.
Optimize codes.
2020-06-25 00:53:38 +08:00
Tindy X 8138fadd48 Enhancements
Fix support for converting Quantumult X rulesets to Surge format.
Add support for exporting Trojan nodes to Loon configurations.
Optimize codes.
2020-06-24 00:06:01 +08:00
Tindy X e262bb7f4c Fix not correctly converting some Clash rule-providers 2020-06-23 01:32:30 +08:00
Tindy X c873a25fea Fix download fail when cache is disabled 2020-06-23 00:00:35 +08:00
Tindy X 34b19507db Enhancements
Fix ruleset types other than Surge Ruleset not correctly expanded to rules.
Fix trying to limit upload file size.
Fix when no GEOIP rule is added, the Clash Script will not be able to generate.
Add "mixed" target to generate subscriptions with all types of standard subscriptions.
Add passing X-User-Agent and X-Client-IP header to subscription downloader.
Optimize codes.
2020-06-22 21:40:18 +08:00
Tindy X 06eb71d1c4 Fix examples in pref.ini 2020-06-20 23:38:55 -05:00
Tindy X 43223a4ec0 Fix rename/emoji scripts not working with INI 2020-06-20 23:37:53 -05:00
Tindy X 51a3b3ac76 Fix build error on some platforms 2020-06-21 09:31:31 +08:00
Tindy X 46f334a564 Enhancements
Fix support for parsing keyword type in Clash domain rule-provider.
Fix potential error on reading configuration files.
Fix not processing remarks with comma when exporting some subscriptions.
Add geoip as script function.
Add support for using script to rename nodes and add Emojis to remarks.
2020-06-21 08:17:12 +08:00
Tindy X 5f87abec16 Rename sections in configurations 2020-06-20 00:13:06 +08:00
Tindy X 605e273d69 Enhancements
Change section and key names in configuration files.
Add support for using Quantumult X rulesets/Clash rule-providers as rule sources.
Optimize codes.
2020-06-19 23:57:10 +08:00
Tindy X ee6de60223 Enhancements
Add independent option for adding/removing Emojis in URL argument.
Add support for reading API_MODE/API_TOKEN/MANAGED_PREFIX from environment variables.
Optimize codes.
2020-06-15 13:51:03 +08:00
Tindy X 0a7e1cac97 Enhancements
Add support for adding proxy provider to custom group in Clash configurations.
Add and, or, bool as template function.
Add support for any amount of argument for template function join.
inja: Add variadic function callback support.
2020-06-12 18:06:01 +08:00
Tindy X 80d16f3130 Optimize codes
Move node renaming after removing Emojis.
2020-06-10 22:52:17 +08:00
Tindy X 11ed400fc7 Optimize codes
Fix keeping UDP/TFO/Skip Cert Verify flags from original subscriptions not working.
Fix compiler warning.
2020-06-08 20:41:02 +08:00
Tindy X 64b5d3bdaa Enhancements
Fix exporting useless info in Clash HTTP/SOCKS 5 nodes.
Add support for exporting Clash classical rule-provider.
Optimize codes.
Update build script.
2020-06-08 19:56:06 +08:00
Tindy X d0e4bed68c Fix script 2020-06-08 14:22:34 +08:00
Tindy X 5d40c2c9c0 Add Actions script for building Docker images 2020-06-08 14:18:31 +08:00
Tindy X 073966825b Fix sort_script causing program crash 2020-06-06 14:47:59 +08:00
Tindy X 8d0fc42ad3 Enhancements
Add support for parsing Clash subscriptions in JSON format.
Add retry for downloading files.
Optimize codes.
Update local rulesets and configs.
2020-06-05 10:52:59 +08:00
Tindy X ac11260747 Fix support for some non-standard Shadowsocks subscriptions 2020-06-02 12:31:28 +08:00
Tindy X 226c9a4db7 Enhancements
Add support for suffix tag in Clash rule provider.
Add request._args variable to templates to read all arguments passed from URL.
Add startsWith/endsWith as template functions.
Add reporting HTTP status code when failed to upload to Gist.
2020-05-31 13:55:48 +08:00
Tindy X cf58da6204 Update Dockerfile 2020-05-31 11:39:03 +08:00
Tindy X 2b78db1164 Update build scripts 2020-05-30 18:28:38 +08:00
Tindy X a61a450fbe Enhancements
Add support for tolerance option in Clash proxy groups.
Add options for specifying maximum allowed rulesets in external configs and generated rules.
2020-05-30 18:09:23 +08:00
Tindy X 8eadbcd6ea Update Dockerfile 2020-05-30 17:34:27 +08:00
Tindy X 228d306415 Update Travis script 2020-05-29 23:32:38 +08:00
Tindy X b2b0bbd143 Update build script 2020-05-29 19:53:12 +08:00
Tindy X 73a3b36bbe Update build script 2020-05-29 19:47:07 +08:00
Tindy X 3601a10132 Fix compile error 2020-05-29 19:41:28 +08:00
Tindy X 09e13adaeb Update build scripts
Make compiler happy.
2020-05-29 19:36:18 +08:00
Tindy X f30b3c7cbf Breaking changes
Fix data URIs not correctly parsed.
Fix downloading files may be caught in infinite redirect loops.
Add experimental JavaScript support for providing subscriptions, filtering nodes, sorting nodes and generating groups.
Add tag support for adding group name to a specific link.
Add complete matcher support for Emoji and rename match rule.
Optimize codes.
Update build scripts.
2020-05-29 19:15:05 +08:00
Tindy X 8385792fec Bugs fix
Fix not correctly handle nodes with only Emojis as remarks.
Fix not correctly handle nodes with port 0.
Fix not correctly handle rename patterns that may make remarks empty.
2020-05-24 09:53:44 +08:00
Tindy X 42b00c5ce7 Enhancements
Fix support for parsing Surge HTTP / SOCKS5 nodes.
Optimize codes.
2020-05-23 03:00:12 +08:00
Tindy X a1b7d635ba Add max rules limit to 32768
Add getLink to template function.
Change max ruleset limit in external configs to 64.
2020-05-18 01:30:54 +08:00
Tindy X 6219ad03bb Fix GROUP/GROUPID/INSERT matcher not correctly handle empty rules 2020-05-17 20:46:55 +08:00
Tindy X d00e901d23 Fix compile error 2020-05-15 23:26:26 +08:00
Tindy X 54747a3268 Enhancements
Fix broken SSID group exported to Quantumult X configurations. (#167)
Fix compatibility with some V2Ray-Core configurations.
Add support for using CORS proxy in downloading.
Optimize codes.
2020-05-15 22:47:31 +08:00
Tindy X 2628c1beb3 Raise download file size limit to 1MB 2020-05-13 18:39:05 +08:00
Tindy X 67c6b6b43d Fix Emoji settings not working in external configs in YAML format 2020-05-13 18:10:40 +08:00
Tindy X 0bf53578f7 Bump version to v0.5.2 2020-05-12 23:37:47 +08:00
Tindy X d84cb164ae Optimize codes 2020-05-09 11:51:41 +08:00
Tindy X c77f064e88 Update local rulesets and configs 2020-05-08 17:10:33 +08:00
Tindy X 5211ca1a5d Add support for exporting SSID group to Quantumult configurations 2020-05-06 19:19:52 +08:00
Tindy X 40d3b36f92 Enhancements
Add support for specifying node rename pattern in URL argument.
Optimize codes.
2020-05-05 22:40:32 +08:00
Tindy X af7d7fae05 Enhancements
Add support for Quantumult X IP6-CIDR rules.
Add SNI host settings to Surge VMess nodes.
2020-05-04 23:59:43 +08:00
Tindy X 23d64632de Add default switch for enabling insert_url 2020-05-02 22:56:38 +08:00
Tindy X 5b692c800b Rework logic for insert_url
Add "prepend" option to control where to add insert_url.
2020-05-02 10:37:13 +08:00
Tindy X f6f2ced3c7 Enhancements
Fix incorrect flag for expanding rulesets to rules.
Add support for generating Clash rule-providers in Rule mode.
Rework Clash script generator.
Change global UDP/TFO/Skip Cert Verify settings in pref configuration to comments.
Optimize codes.
2020-05-01 23:59:01 +08:00
Tindy X 2c793a0f95 Fix parse error with some Surge/Quantumult X subscriptions 2020-05-01 14:04:06 +08:00
Tindy X 94baa44870 Fix compile error 2020-05-01 10:54:17 +08:00
Tindy X c99230e551 Enhancements
Fix support for parsing some subscriptions with complex passwords.
Add replacing all match when using rename_node.
Remove support for std::regex for now.
Optimize codes.
2020-05-01 10:50:08 +08:00
Tindy X a2746fc804 Add support for combining multiple profile 2020-04-30 18:54:53 +08:00
Tindy X 7637e021f8 Add keeping UDP/TFO/Skip Cert Verify settings in subscriptions 2020-04-30 00:08:15 +08:00
Tindy X 592ce87788 Bug fixes
Fix program crash when processing broken template variables passed.
Fix trying to load other arguments when no supported target is provided.
Optimize codes.
2020-04-29 00:38:19 +08:00
Tindy X a22c77c877 Enhancements
Fix not correctly loading configuration file when api_mode is false.
Add support for exporting Surge DOMAIN-SET.
Add INSERT group match flag to match insert_url only.
Optimize codes.
2020-04-28 14:46:28 +08:00
Tindy X cb6f6ec6e9 Add back condition for adding tls-verification flag for Quantumult X 2020-04-25 09:41:50 +08:00
Tindy X 08c5b571c8 Add experimental Clash script generator 2020-04-24 23:56:57 +08:00
Tindy X 40bb4276d7 Enhancements
Add 1MB file download size limit to prevent feeding a large file to the processor.
Add file scope limit to rule_base options in external config to prevent loading sensitive files as rule base.
Add support for generating Clash DOMAIN/IP-CIDR rule-providers.
Optimize codes.
2020-04-23 22:12:56 +08:00
Tindy X 8662aa36cc Enhancements
Fix compiler warnings.
Add detailed description for some settings in pref configuration.
Add passing arguments of alias name to alias target.
Optimize codes.
2020-04-23 00:27:38 +08:00
Tindy X 11c3e2a7c8 Optimize codes 2020-04-21 23:17:55 +08:00
Tindy X 52c8eff182 Enhancements
Add URL aliasing support to shorten request URL.
Add support for parsing and exporting Snell server in configurations.
Add numbering system to process duplicated node names.
Optimize codes.
2020-04-21 22:29:16 +08:00
Tindy X 4b5e0e1346 Enhancements
Fix /render not correctly render UTF-8 content.
Add append to template function.
Optimize codes.
2020-04-19 13:12:09 +08:00
Tindy X 48c12054af Fix changed ruleset in default configuration 2020-04-14 21:20:37 +08:00
Tindy X 3e3f22d8f9 Bump version to v0.5.1 2020-04-14 19:23:37 +08:00
Tindy X 4d544b4843 Fix incorrect argument count for find in template
Add managed_config_prefix to global variables in template.
2020-04-14 18:42:58 +08:00
Tindy X ef8b4e39ef Enhancements
Add SNI host parsing support for Trojan subscriptions.
Add detailed log report.
Optimize codes.
Update build scripts.
2020-04-14 11:32:21 +08:00
Tindy X 4cee6b5a5e Add split as a template function 2020-04-13 23:59:37 +08:00
Tindy X 3b81dce730 Enhancement
Add /render interface to directly render a template as output content.
Add find as a template function.
Add filtering out token as a template variable.
2020-04-13 20:47:17 +08:00
Tindy X 983686a19e Update local rulesets and configs 2020-04-12 20:29:45 +08:00
Tindy X dada1d4b09 Fix /getruleset not filtering PROCESS-NAME / IP-CIDR6 for Quantumult X 2020-04-11 20:31:26 +08:00
Tindy X 87ea770824 Update inja library to latest version 2020-04-11 14:48:03 +08:00
Tindy X b52e47ba9c Bugs fix
Fix logical error causing local rulesets are missing in configurations.
Fix not filtering IP-CIDR6 / PROCESS-NAME rules in Quantumult X rules.
2020-04-11 09:57:08 +08:00
Tindy X 5f0c2d1b47 Enhancements
Fix exporting broken configuration file in some occasions.
Fix directly treating not-exist ruleset file as URL.
Fix group fallback not working on Quantumult X configurations.
Fix typo in example profile.
Add specifying default external configuration file to use when none is provided.
Optimize codes.
2020-04-10 18:18:57 +08:00
Tindy X 025d0eb4e1 Enhancements
Fix support for parsing some Surge configurations.
Fix adding extra blank line to section end when exporting some configurations.
Fix adding real internal link as MANAGED-CONFIG URL when using profile.
Fix not filtering load-balance group in Surfboard configurations. (Issue [#128](https://github.com/tindy2013/subconverter/issues/128)).
Fix rule type filter not working properly.
Add support for using template in external configurations.
Add relay group support for Clash configurations.
Optimize codes.
2020-04-09 21:07:50 +08:00
Tindy X 3d2c8c8038 Enhancements
Fix error when parsing some Surge configurations.
Fix not filtering USER-AGENT and URL-REGEX rules for Surfboard configurations. (Issue [#127](https://github.com/tindy2013/subconverter/issues/127)).
Add support for specifying tolerance and timeout for some proxy groups. (Issue [#121](https://github.com/tindy2013/subconverter/issues/121)).
Add keeping comments and blank lines for more sections in Quantumult X configurations.
Add rule type match to filter rules.
Optimize codes.
2020-04-08 23:51:46 +08:00
Tindy X 41393870ce Enhancements
Fix trying to fetch a ruleset when adding it as a RULE-SET rule to configuration files.
Add URL Decode to username and password field in Telegram-link-style HTTP/Socks 5 links.
Add more function callbacks to template renderer.
Add basic Jinja2Cpp template library support.
INIReader: Add keeping comments and blank lines in direct-save sections.
2020-04-08 17:03:27 +08:00
Tindy X 31684a3796 Fix error in processing URL arguments 2020-04-06 15:57:46 +08:00
Tindy X 13187e2e08 Bugs fix
Fix inconsistent argument name in HTTP and Socks 5 single link.
Fix support for some non-standard ShadowsocksD subscription.
Fix include/exclude option in URL argument not overriding former settings.
Fix template system interpreting some comments in YAML files as line statement.
inja: re-implement variable accessing to catch exceptions on using not-exist variable and return an empty value.
Optimize codes.
2020-04-06 14:07:16 +08:00
Tindy X ccb525a579 Bump version to v0.5.0 2020-04-05 18:02:15 +08:00
Tindy X 7ad3028404 Fix not processing duplicated node names in Quantumult configurations
Optimize codes.
2020-04-05 17:42:17 +08:00
Tindy X e6a00e4280 Update local rulesets and configs 2020-04-05 17:12:58 +08:00
Tindy X 79b9211c7f Add warning log when failed to fetch a ruleset or the ruleset is empty 2020-04-05 16:53:09 +08:00
Tindy X d8c4a13fdb Add appending all /getProfile arguments to internal call
Optimize codes.
2020-04-04 23:03:14 +08:00
Tindy X f63420be12 Enhancements
inja: re-implement exists() to work with JSON pointer for quick usage.
inja: move include scope limit config to ParserConfig.
Optimize codes.
2020-04-04 00:33:44 +08:00
Tindy X bcc4422e87 Fix SNI host missing in Surge configurations 2020-04-03 23:10:53 +08:00
Tindy X a034e872cf Update build scripts 2020-04-02 23:26:53 +08:00
Tindy X eeae32f8eb Breaking changes
Fix broken /sub2clashr and /surge2clash interface.
Add template support for base configurations.
Add support for exporting HTTP/Socks 5 nodes to Quantumult configurations.
Add support for VMess HTTP nodes in Clash configurations.
Optimize codes.
2020-04-02 23:18:26 +08:00
Tindy X 58349a086d Fix not processing duplicated node remarks in Surge Node List 2020-04-01 20:24:18 +08:00
Tindy X 571ff14b13 Fix potential crash when parsing V2Ray configs 2020-04-01 12:39:20 +08:00
Tindy X 4fbc9d3ff2 Fix support for using \x in regular expressions to match character 2020-04-01 11:26:37 +08:00
Tindy X d06ecdb010 Add support for Shadowrocket style HTTP nodes subscription 2020-04-01 10:47:21 +08:00