chore: bump release version

chore: Change network request method

README.md

@@ -11,7 +11,7 @@ Advanced Subscription Manager for QX, Loon, Surge, Stash and Shadowrocket.
 </p>
 
 [![Build](https://github.com/sub-store-org/Sub-Store/actions/workflows/main.yml/badge.svg)](https://github.com/sub-store-org/Sub-Store/actions/workflows/main.yml) ![GitHub](https://img.shields.io/github/license/sub-store-org/Sub-Store) ![GitHub issues](https://img.shields.io/github/issues/sub-store-org/Sub-Store) ![GitHub closed pull requests](https://img.shields.io/github/issues-pr-closed-raw/Peng-Ym/Sub-Store) ![Lines of code](https://img.shields.io/tokei/lines/github/sub-store-org/Sub-Store) ![Size](https://img.shields.io/github/languages/code-size/sub-store-org/Sub-Store) 
-
+<a href="https://trendshift.io/repositories/4572" target="_blank"><img src="https://trendshift.io/api/badge/repositories/4572" alt="sub-store-org%2FSub-Store | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
 [!["Buy Me A Coffee"](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/PengYM)
    
 Core functionalities:

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.14.298",
+  "version": "2.14.312",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
   "main": "src/main.js",
   "scripts": {
@@ -17,6 +17,7 @@
   "author": "Peng-YM",
   "license": "GPL-3.0",
   "dependencies": {
+    "@maxmind/geoip2-node": "^5.0.0",
     "automerge": "1.0.1-preview.7",
     "body-parser": "^1.19.0",
     "connect-history-api-fallback": "^2.0.0",

backend/pnpm-lock.yaml

@@ -5,6 +5,9 @@ settings:
   excludeLinksFromLockfile: false
 
 dependencies:
+  '@maxmind/geoip2-node':
+    specifier: ^5.0.0
+    version: registry.npmmirror.com/@maxmind/geoip2-node@5.0.0
   automerge:
     specifier: 1.0.1-preview.7
     version: registry.npmmirror.com/automerge@1.0.1-preview.7
@@ -1967,6 +1970,15 @@ packages:
       '@jridgewell/sourcemap-codec': registry.npmmirror.com/@jridgewell/sourcemap-codec@1.4.13
     dev: true
 
+  registry.npmmirror.com/@maxmind/geoip2-node@5.0.0:
+    resolution: {integrity: sha512-ki+q5//oU4tZ3BAhegZJcB5czoZyic5JSTEKbrUAQB/BzAoAiGyLW0immEmQvVVyy2SMlvBTJ3zqyRj8K9BbwQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@maxmind/geoip2-node/-/geoip2-node-5.0.0.tgz}
+    name: '@maxmind/geoip2-node'
+    version: 5.0.0
+    dependencies:
+      ip6addr: registry.npmmirror.com/ip6addr@0.2.5
+      maxmind: registry.npmmirror.com/maxmind@4.3.19
+    dev: false
+
   registry.npmmirror.com/@sindresorhus/is@0.14.0:
     resolution: {integrity: sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@sindresorhus/is/-/is-0.14.0.tgz}
     name: '@sindresorhus/is'
@@ -5988,6 +6000,15 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  registry.npmmirror.com/ip6addr@0.2.5:
+    resolution: {integrity: sha512-9RGGSB6Zc9Ox5DpDGFnJdIeF0AsqXzdH+FspCfPPaU/L/4tI6P+5lIoFUFm9JXs9IrJv1boqAaNCQmoDADTSKQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ip6addr/-/ip6addr-0.2.5.tgz}
+    name: ip6addr
+    version: 0.2.5
+    dependencies:
+      assert-plus: registry.npmmirror.com/assert-plus@1.0.0
+      jsprim: registry.npmmirror.com/jsprim@2.0.2
+    dev: false
+
   registry.npmmirror.com/ipaddr.js@1.9.1:
     resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz}
     name: ipaddr.js
@@ -6556,6 +6577,12 @@ packages:
     version: 0.2.3
     dev: false
 
+  registry.npmmirror.com/json-schema@0.4.0:
+    resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/json-schema/-/json-schema-0.4.0.tgz}
+    name: json-schema
+    version: 0.4.0
+    dev: false
+
   registry.npmmirror.com/json-stable-stringify-without-jsonify@1.0.1:
     resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz}
     name: json-stable-stringify-without-jsonify
@@ -6595,6 +6622,18 @@ packages:
       verror: registry.npmmirror.com/verror@1.10.0
     dev: false
 
+  registry.npmmirror.com/jsprim@2.0.2:
+    resolution: {integrity: sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsprim/-/jsprim-2.0.2.tgz}
+    name: jsprim
+    version: 2.0.2
+    engines: {'0': node >=0.6.0}
+    dependencies:
+      assert-plus: registry.npmmirror.com/assert-plus@1.0.0
+      extsprintf: registry.npmmirror.com/extsprintf@1.3.0
+      json-schema: registry.npmmirror.com/json-schema@0.4.0
+      verror: registry.npmmirror.com/verror@1.10.0
+    dev: false
+
   registry.npmmirror.com/just-debounce@1.1.0:
     resolution: {integrity: sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/just-debounce/-/just-debounce-1.1.0.tgz}
     name: just-debounce
@@ -6943,6 +6982,16 @@ packages:
       - supports-color
     dev: true
 
+  registry.npmmirror.com/maxmind@4.3.19:
+    resolution: {integrity: sha512-Bu/VEN7ZWAOCjifdZaXJQuN6/yO7+OK35pnJsqmz8sOndK3KQFvJoY+6HX09/MmLLqtCfa+sMK0iaQOaTejGNA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/maxmind/-/maxmind-4.3.19.tgz}
+    name: maxmind
+    version: 4.3.19
+    engines: {node: '>=12', npm: '>=6'}
+    dependencies:
+      mmdb-lib: registry.npmmirror.com/mmdb-lib@2.1.0
+      tiny-lru: registry.npmmirror.com/tiny-lru@11.2.6
+    dev: false
+
   registry.npmmirror.com/md5.js@1.3.5:
     resolution: {integrity: sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/md5.js/-/md5.js-1.3.5.tgz}
     name: md5.js
@@ -7132,6 +7181,13 @@ packages:
     version: 0.5.3
     dev: true
 
+  registry.npmmirror.com/mmdb-lib@2.1.0:
+    resolution: {integrity: sha512-tdDTZmnI5G4UoSctv2KxM/3VQt2XRj4CmR5R4VsAWsOUcS3LysHR34wtixWm/pXxXdkBDuN92auxkC0T2+qd1Q==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/mmdb-lib/-/mmdb-lib-2.1.0.tgz}
+    name: mmdb-lib
+    version: 2.1.0
+    engines: {node: '>=10', npm: '>=6'}
+    dev: false
+
   registry.npmmirror.com/mocha@10.0.0:
     resolution: {integrity: sha512-0Wl+elVUD43Y0BqPZBzZt8Tnkw9CMUdNYnUsTfOM1vuhJVZL+kiesFYsqwBkEEuEixaiPe5ZQdqDgX2jddhmoA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/mocha/-/mocha-10.0.0.tgz}
     name: mocha
@@ -9424,6 +9480,13 @@ packages:
       process: registry.npmmirror.com/process@0.11.10
     dev: true
 
+  registry.npmmirror.com/tiny-lru@11.2.6:
+    resolution: {integrity: sha512-0PU3c9PjMnltZaFo2sGYv/nnJsMjG0Cxx8X6FXHPPGjFyoo1SJDxvUXW1207rdiSxYizf31roo+GrkIByQeZoA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tiny-lru/-/tiny-lru-11.2.6.tgz}
+    name: tiny-lru
+    version: 11.2.6
+    engines: {node: '>=12'}
+    dev: false
+
   registry.npmmirror.com/tinyify@3.0.0:
     resolution: {integrity: sha512-RtjVjC1xwwxt8AMVfxEmo+FzRJB6p5sAOtFaJj8vMrkWShtArsM4dLVRWhx2Vc07Me3NWgmP7pi9UPm/a2XNNA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tinyify/-/tinyify-3.0.0.tgz}
     name: tinyify

backend/src/core/proxy-utils/index.js

@@ -15,7 +15,8 @@ import $ from '@/core/app';
 import { FILES_KEY, MODULES_KEY } from '@/constants';
 import { findByName } from '@/utils/database';
 import { produceArtifact } from '@/restful/sync';
-import { getFlag, getISO } from '@/utils/geo';
+import { getFlag, getISO, MMDB } from '@/utils/geo';
+import Gist from '@/utils/gist';
 
 function preprocess(raw) {
     for (const processor of PROXY_PREPROCESSORS) {
@@ -219,7 +220,7 @@ function produce(proxies, targetPlatform, type, opts = {}) {
     $.log(`Producing proxies for target: ${targetPlatform}`);
     if (typeof producer.type === 'undefined' || producer.type === 'SINGLE') {
         let localPort = 10000;
-        const list = proxies
+        let list = proxies
             .map((proxy) => {
                 try {
                     let line = producer.produce(proxy, type, opts);
@@ -245,7 +246,18 @@ function produce(proxies, targetPlatform, type, opts = {}) {
                 }
             })
             .filter((line) => line.length > 0);
-        return type === 'internal' ? list : list.join('\n');
+        list = type === 'internal' ? list : list.join('\n');
+        if (
+            targetPlatform.startsWith('Surge') &&
+            proxies.length > 0 &&
+            proxies.every((p) => p.type === 'wireguard')
+        ) {
+            list = `#!name=${proxies[0]?.subName}
+#!desc=${proxies[0]?._desc ?? ''}
+#!category=${proxies[0]?._category ?? ''}
+${list}`;
+        }
+        return list;
     } else if (producer.type === 'ALL') {
         return producer.produce(proxies, type, opts);
     }
@@ -261,6 +273,8 @@ export const ProxyUtils = {
     yaml: YAML,
     getFlag,
     getISO,
+    MMDB,
+    Gist,
 };
 
 function tryParse(parser, line) {

backend/src/core/proxy-utils/parsers/index.js

@@ -16,6 +16,7 @@ import { Base64 } from 'js-base64';
 // Parse SS URI format (only supports new SIP002, legacy format is depreciated).
 // reference: https://github.com/shadowsocks/shadowsocks-org/wiki/SIP002-URI-Scheme
 function URI_SS() {
+    // TODO: 暂不支持 httpupgrade
     const name = 'URI SS Parser';
     const test = (line) => {
         return /^ss:\/\//.test(line);
@@ -299,6 +300,7 @@ function URI_VMess() {
             if (proxy.tls && proxy.sni) {
                 proxy.sni = params.sni;
             }
+            let httpupgrade = false;
             // handle obfs
             if (params.net === 'ws' || params.obfs === 'websocket') {
                 proxy.network = 'ws';
@@ -309,6 +311,12 @@ function URI_VMess() {
                 proxy.network = 'http';
             } else if (['grpc'].includes(params.net)) {
                 proxy.network = 'grpc';
+            } else if (
+                params.net === 'httpupgrade' ||
+                proxy.network === 'httpupgrade'
+            ) {
+                proxy.network = 'ws';
+                httpupgrade = true;
             }
             if (proxy.network) {
                 let transportHost = params.host ?? params.obfsParam;
@@ -341,10 +349,15 @@ function URI_VMess() {
                             '_grpc-type': getIfNotBlank(params.type),
                         };
                     } else {
-                        proxy[`${proxy.network}-opts`] = {
+                        const opts = {
                             path: getIfNotBlank(transportPath),
                             headers: { Host: getIfNotBlank(transportHost) },
                         };
+                        if (httpupgrade) {
+                            opts['v2ray-http-upgrade'] = true;
+                            opts['v2ray-http-upgrade-fast-open'] = true;
+                        }
+                        proxy[`${proxy.network}-opts`] = opts;
                     }
                 } else {
                     delete proxy.network;
@@ -444,10 +457,13 @@ function URI_VLESS() {
                 proxy[`${params.security}-opts`] = opts;
             }
         }
-
+        let httpupgrade = false;
         proxy.network = params.type;
         if (proxy.network === 'tcp' && params.headerType === 'http') {
             proxy.network = 'http';
+        } else if (proxy.network === 'httpupgrade') {
+            proxy.network = 'ws';
+            httpupgrade = true;
         }
         if (!proxy.network && isShadowrocket && params.obfs) {
             proxy.network = params.obfs;
@@ -485,6 +501,10 @@ function URI_VLESS() {
             if (['grpc'].includes(proxy.network)) {
                 opts['_grpc-type'] = params.mode || 'gun';
             }
+            if (httpupgrade) {
+                opts['v2ray-http-upgrade'] = true;
+                opts['v2ray-http-upgrade-fast-open'] = true;
+            }
             if (Object.keys(opts).length > 0) {
                 proxy[`${proxy.network}-opts`] = opts;
             }

backend/src/core/proxy-utils/parsers/peggy/qx.js

@@ -50,8 +50,11 @@ trojan = "trojan" equals address
 
 shadowsocks = "shadowsocks" equals address
     (password/method/obfs_ssr/obfs_ss/obfs_host/obfs_uri/ssr_protocol/ssr_protocol_param/tls_pubkey_sha256/tls_alpn/tls_no_session_ticket/tls_no_session_reuse/tls_fingerprint/tls_verification/udp_relay/udp_over_tcp/fast_open/tag/server_check_url/others)* {
-    if (proxy.protocol) {
+    if (proxy.protocol || proxy.type === "ssr") {
         proxy.type = "ssr";
+        if (!proxy.protocol) {
+            proxy.protocol = "origin";
+        }
         // handle ssr obfs
         if (obfs.host) proxy["obfs-param"] = obfs.host;
         if (obfs.type) proxy.obfs = obfs.type;
@@ -172,7 +175,7 @@ tls_no_session_reuse = comma "tls-no-session-reuse" equals flag:bool {
 }
 
 obfs_ss = comma "obfs" equals type:("http"/"tls"/"wss"/"ws"/"over-tls") { obfs.type = type; return type; }
-obfs_ssr = comma "obfs" equals type:("plain"/"http_simple"/"http_post"/"random_head"/"tls1.2_ticket_auth"/"tls1.2_ticket_fastauth") { obfs.type = type; return type; }
+obfs_ssr = comma "obfs" equals type:("plain"/"http_simple"/"http_post"/"random_head"/"tls1.2_ticket_auth"/"tls1.2_ticket_fastauth") { proxy.type = "ssr"; obfs.type = type; return type; }
 obfs = comma "obfs" equals type:("wss"/"ws"/"over-tls"/"http") { obfs.type = type; return type; };
 
 obfs_host = comma "obfs-host" equals host:domain { obfs.host = host; }

backend/src/core/proxy-utils/parsers/peggy/qx.peg

@@ -48,8 +48,11 @@ trojan = "trojan" equals address
 
 shadowsocks = "shadowsocks" equals address
     (password/method/obfs_ssr/obfs_ss/obfs_host/obfs_uri/ssr_protocol/ssr_protocol_param/tls_pubkey_sha256/tls_alpn/tls_no_session_ticket/tls_no_session_reuse/tls_fingerprint/tls_verification/udp_relay/udp_over_tcp/fast_open/tag/server_check_url/others)* {
-    if (proxy.protocol) {
+    if (proxy.protocol || proxy.type === "ssr") {
         proxy.type = "ssr";
+        if (!proxy.protocol) {
+            proxy.protocol = "origin";
+        }
         // handle ssr obfs
         if (obfs.host) proxy["obfs-param"] = obfs.host;
         if (obfs.type) proxy.obfs = obfs.type;
@@ -170,7 +173,7 @@ tls_no_session_reuse = comma "tls-no-session-reuse" equals flag:bool {
 }
 
 obfs_ss = comma "obfs" equals type:("http"/"tls"/"wss"/"ws"/"over-tls") { obfs.type = type; return type; }
-obfs_ssr = comma "obfs" equals type:("plain"/"http_simple"/"http_post"/"random_head"/"tls1.2_ticket_auth"/"tls1.2_ticket_fastauth") { obfs.type = type; return type; }
+obfs_ssr = comma "obfs" equals type:("plain"/"http_simple"/"http_post"/"random_head"/"tls1.2_ticket_auth"/"tls1.2_ticket_fastauth") { proxy.type = "ssr"; obfs.type = type; return type; }
 obfs = comma "obfs" equals type:("wss"/"ws"/"over-tls"/"http") { obfs.type = type; return type; };
 
 obfs_host = comma "obfs-host" equals host:domain { obfs.host = host; }

backend/src/core/proxy-utils/parsers/peggy/trojan-uri.js

@@ -89,7 +89,12 @@ params = "?" head:param tail:("&"@param)* {
   }
   
   if (params["type"]) {
+    let httpupgrade
     proxy.network = params["type"]
+    if(proxy.network === 'httpupgrade') {
+      proxy.network = 'ws'
+      httpupgrade = true
+    }
     if (['grpc'].includes(proxy.network)) {
         proxy[proxy.network + '-opts'] = {
             'grpc-service-name': params["serviceName"],
@@ -102,6 +107,10 @@ params = "?" head:param tail:("&"@param)* {
       if (params["host"]) {
         $set(proxy, proxy.network+"-opts.headers.Host", decodeURIComponent(params["host"])); 
       }
+      if (httpupgrade) {
+        $set(proxy, proxy.network+"-opts.v2ray-http-upgrade", true); 
+        $set(proxy, proxy.network+"-opts.v2ray-http-upgrade-fast-open", true); 
+      }
     }
   }
 

backend/src/core/proxy-utils/parsers/peggy/trojan-uri.peg

@@ -87,7 +87,12 @@ params = "?" head:param tail:("&"@param)* {
   }
   
   if (params["type"]) {
+    let httpupgrade
     proxy.network = params["type"]
+    if(proxy.network === 'httpupgrade') {
+      proxy.network = 'ws'
+      httpupgrade = true
+    }
     if (['grpc'].includes(proxy.network)) {
         proxy[proxy.network + '-opts'] = {
             'grpc-service-name': params["serviceName"],
@@ -100,6 +105,10 @@ params = "?" head:param tail:("&"@param)* {
       if (params["host"]) {
         $set(proxy, proxy.network+"-opts.headers.Host", decodeURIComponent(params["host"])); 
       }
+      if (httpupgrade) {
+        $set(proxy, proxy.network+"-opts.v2ray-http-upgrade", true); 
+        $set(proxy, proxy.network+"-opts.v2ray-http-upgrade-fast-open", true); 
+      }
     }
   }
 

backend/src/core/proxy-utils/processors/index.js

@@ -867,7 +867,7 @@ function clone(object) {
 // remove flag
 function removeFlag(str) {
     return str
-        .replace(/[\uD83C][\uDDE6-\uDDFF][\uD83C][\uDDE6-\uDDFF]/g, '')
+        .replace(/[\uD83C][\uDDE6-\uDDFF][\uD83C][\uDDE6-\uDDFF]|🏴‍☠️|🏳️‍🌈/g, '')
         .trim();
 }
 

backend/src/core/proxy-utils/producers/surge.js

@@ -762,8 +762,8 @@ function wireguard(proxy) {
     }
     const result = new Result(proxy);
 
-    result.append(`# WireGuard Proxy ${proxy.name}
-${proxy.name}=wireguard`);
+    result.append(`# > WireGuard Proxy ${proxy.name}
+# ${proxy.name}=wireguard`);
 
     proxy['section-name'] = getIfNotBlank(proxy['section-name'], proxy.name);
 
@@ -821,7 +821,7 @@ ${proxy.name}=wireguard`);
     );
 
     result.append(`
-# WireGuard Section ${proxy.name}
+# > WireGuard Section ${proxy.name}
 [WireGuard ${proxy['section-name']}]
 private-key = ${proxy['private-key']}`);
 

backend/src/core/proxy-utils/producers/uri.js

@@ -26,7 +26,7 @@ export default function URI_Producer() {
                 const userinfo = `${proxy.cipher}:${proxy.password}`;
                 result = `ss://${Base64.encode(userinfo)}@${proxy.server}:${
                     proxy.port
-                }/`;
+                }${proxy.plugin ? '/' : ''}`;
                 if (proxy.plugin) {
                     result += '?plugin=';
                     const opts = proxy['plugin-opts'];
@@ -55,7 +55,9 @@ export default function URI_Producer() {
                     result = `${result}${proxy.plugin ? '&' : '?'}uot=1`;
                 }
                 if (proxy.tfo) {
-                    result = `${result}${proxy.plugin ? '&' : '?'}tfo=1`;
+                    result = `${result}${
+                        proxy.plugin || proxy['udp-over-tcp'] ? '&' : '?'
+                    }tfo=1`;
                 }
                 result += `#${encodeURIComponent(proxy.name)}`;
                 break;
@@ -82,6 +84,11 @@ export default function URI_Producer() {
                 if (proxy.network === 'http') {
                     net = 'tcp';
                     type = 'http';
+                } else if (
+                    proxy.network === 'ws' &&
+                    proxy['ws-opts']?.['v2ray-http-upgrade']
+                ) {
+                    net = 'httpupgrade';
                 }
                 result = {
                     v: '2',
@@ -170,9 +177,15 @@ export default function URI_Producer() {
                 if (proxy.flow) {
                     flow = `&flow=${encodeURIComponent(proxy.flow)}`;
                 }
-                let vlessTransport = `&type=${encodeURIComponent(
-                    proxy.network,
-                )}`;
+                let vlessType = proxy.network;
+                if (
+                    proxy.network === 'ws' &&
+                    proxy['ws-opts']?.['v2ray-http-upgrade']
+                ) {
+                    vlessType = 'httpupgrade';
+                }
+
+                let vlessTransport = `&type=${encodeURIComponent(vlessType)}`;
                 if (['grpc'].includes(proxy.network)) {
                     // https://github.com/XTLS/Xray-core/issues/91
                     vlessTransport += `&mode=${encodeURIComponent(
@@ -218,7 +231,14 @@ export default function URI_Producer() {
             case 'trojan':
                 let trojanTransport = '';
                 if (proxy.network) {
-                    trojanTransport = `&type=${proxy.network}`;
+                    let trojanType = proxy.network;
+                    if (
+                        proxy.network === 'ws' &&
+                        proxy['ws-opts']?.['v2ray-http-upgrade']
+                    ) {
+                        trojanType = 'httpupgrade';
+                    }
+                    trojanTransport = `&type=${encodeURIComponent(trojanType)}`;
                     if (['grpc'].includes(proxy.network)) {
                         let trojanTransportServiceName =
                             proxy[`${proxy.network}-opts`]?.[

backend/src/restful/artifacts.js

@@ -253,7 +253,25 @@ async function syncToGist(files) {
         key: ARTIFACT_REPOSITORY_KEY,
         syncPlatform,
     });
-    return manager.upload(files);
+    const res = await manager.upload(files);
+    let body = {};
+    try {
+        body = JSON.parse(res.body);
+        // eslint-disable-next-line no-empty
+    } catch (e) {}
+
+    const url = body?.html_url ?? body?.web_url;
+    const settings = $.read(SETTINGS_KEY);
+    if (url) {
+        $.log(`同步 Gist 后, 找到 Sub-Store Gist: ${url}`);
+        settings.artifactStore = url;
+        settings.artifactStoreStatus = 'VALID';
+    } else {
+        $.error(`同步 Gist 后, 找不到 Sub-Store Gist`);
+        settings.artifactStoreStatus = 'NOT FOUND';
+    }
+    $.write(settings, SETTINGS_KEY);
+    return res;
 }
 
 export { syncToGist };

backend/src/restful/download.js

@@ -469,7 +469,11 @@ function nezhaTransform(output) {
         // 简单判断下
         if (/^[a-z]{2}$/i.test(CountryCode)) {
             // 如果节点上有数据 就取节点上的数据
-            let time = proxy._unavailable ? 0 : Date.now();
+            let now = Math.round(new Date().getTime() / 1000);
+            let time = proxy._unavailable ? 0 : now;
+
+            const uptime = parseInt(proxy._uptime || 0, 10);
+
             result.result.push({
                 id: index,
                 name: proxy.name,
@@ -489,7 +493,7 @@ function nezhaTransform(output) {
                     SwapTotal: 1024,
                     Arch: '',
                     Virtualization: '',
-                    BootTime: time,
+                    BootTime: now - uptime,
                     CountryCode, // 目前需要
                     Version: '0.0.1',
                 },
@@ -502,7 +506,7 @@ function nezhaTransform(output) {
                     NetOutTransfer: 0,
                     NetInSpeed: 0,
                     NetOutSpeed: 0,
-                    Uptime: parseInt(proxy._uptime ?? index, 10),
+                    Uptime: uptime,
                     Load1: 0,
                     Load5: 0,
                     Load15: 0,

backend/src/utils/download.js

@@ -14,7 +14,13 @@ import $ from '@/core/app';
 
 const tasks = new Map();
 
-export default async function download(rawUrl, ua, timeout, proxy) {
+export default async function download(
+    rawUrl,
+    ua,
+    timeout,
+    proxy,
+    skipCustomCache,
+) {
     let $arguments = {};
     let url = rawUrl.replace(/#noFlow$/, '');
     const rawArgs = url.split('#');
@@ -39,6 +45,23 @@ export default async function download(rawUrl, ua, timeout, proxy) {
         ? `#sub-store-cached-custom-${$arguments?.cacheKey}`
         : undefined;
 
+    if (customCacheKey && !skipCustomCache) {
+        const cached = $.read(customCacheKey);
+        if (cached) {
+            $.info(
+                `乐观缓存: URL ${url}\n本次返回自定义缓存 ${$arguments?.cacheKey}\n并进行请求 尝试更新缓存`,
+            );
+            download(
+                rawUrl.replace(/(\?|&)cacheKey=.*?(&|$)/, ''),
+                ua,
+                timeout,
+                proxy,
+                true,
+            );
+            return cached;
+        }
+    }
+
     // const downloadUrlMatch = url.match(/^\/api\/(file|module)\/(.+)/);
     // if (downloadUrlMatch) {
     //     let type = downloadUrlMatch?.[1];
@@ -81,7 +104,7 @@ export default async function download(rawUrl, ua, timeout, proxy) {
 
     // try to find in app cache
     const cached = resourceCache.get(id);
-    if (!$arguments?.noCache && cached) {
+    if (!$arguments?.noCache && cached && !skipCustomCache) {
         $.info(`使用缓存: ${url}`);
         result = cached;
     } else {
@@ -120,6 +143,9 @@ export default async function download(rawUrl, ua, timeout, proxy) {
             if (shouldCache) {
                 resourceCache.set(id, body);
                 if (customCacheKey) {
+                    $.info(
+                        `URL ${url}\n写入自定义缓存 ${$arguments?.cacheKey}`,
+                    );
                     $.write(body, customCacheKey);
                 }
             }

backend/src/utils/env.js

@@ -10,6 +10,7 @@ const {
     isShadowRocket,
     isLanceX,
     isEgern,
+    isGUIforCores,
 } = ENV();
 let backend = 'Node';
 if (isNode) backend = 'Node';
@@ -20,6 +21,7 @@ if (isStash) backend = 'Stash';
 if (isShadowRocket) backend = 'ShadowRocket';
 if (isEgern) backend = 'Egern';
 if (isLanceX) backend = 'LanceX';
+if (isGUIforCores) backend = 'GUI.for.Cores';
 
 let meta = {};
 
@@ -36,6 +38,10 @@ try {
         // eslint-disable-next-line no-undef
         meta.script = $script;
     }
+    if (typeof $Plugin !== 'undefined') {
+        // eslint-disable-next-line no-undef
+        meta.plugin = $Plugin;
+    }
     if (isNode) {
         meta.node = {
             version: eval('process.version'),

backend/src/utils/geo.js

@@ -1,3 +1,5 @@
+import $ from '@/core/app';
+
 const ISOFlags = {
     '🏳️‍🌈': ['EXP', 'BAND'],
     '🇸🇱': ['TEST', 'SOS'],
@@ -427,3 +429,31 @@ export function getFlag(name) {
 export function getISO(name) {
     return ISOFlags[getFlag(name)]?.[0];
 }
+
+export class MMDB {
+    constructor({ country, asn } = {}) {
+        if ($.env.isNode) {
+            const Reader = eval(`require("@maxmind/geoip2-node")`).Reader;
+            const fs = eval("require('fs')");
+            const countryFile =
+                country || eval('process.env.SUB_STORE_MMDB_COUNTRY_PATH');
+            const asnFile = asn || eval('process.env.SUB_STORE_MMDB_ASN_PATH');
+            if (countryFile) {
+                this.countryReader = Reader.openBuffer(
+                    fs.readFileSync(countryFile),
+                );
+            }
+            if (asnFile) {
+                if (!fs.existsSync(asnFile))
+                    throw new Error('GeoLite2 ASN MMDB does not exist');
+                this.asnReader = Reader.openBuffer(fs.readFileSync(asnFile));
+            }
+        }
+    }
+    geoip(ip) {
+        return this.countryReader?.country(ip)?.country?.isoCode;
+    }
+    ipaso(ip) {
+        return this.asnReader?.asn(ip)?.autonomousSystemOrganization;
+    }
+}

backend/src/utils/gist.js

@@ -135,9 +135,9 @@ export default class Gist {
                     }
                 }
             });
-            console.log(`result`, result);
-            console.log(`files`, files);
-            console.log(`actions`, actions);
+            // console.log(`result`, result);
+            // console.log(`files`, files);
+            // console.log(`actions`, actions);
 
             if (this.syncPlatform === 'gitlab') {
                 if (Object.keys(result).length === 0) {

backend/src/vendor/express.js

@@ -161,7 +161,7 @@ export default function express({ substore: $, port, host }) {
 
     function Response() {
         let statusCode = 200;
-        const { isQX, isLoon, isSurge } = ENV();
+        const { isQX, isLoon, isSurge, isGUIforCores } = ENV();
         const headers = DEFAULT_HEADERS;
         const STATUS_CODE_MAP = {
             200: 'HTTP/1.1 200 OK',
@@ -184,7 +184,7 @@ export default function express({ substore: $, port, host }) {
                     body,
                     headers,
                 };
-                if (isQX) {
+                if (isQX || isGUIforCores) {
                     $done(response);
                 } else if (isLoon || isSurge) {
                     $done({

backend/src/vendor/open-api.js

@@ -8,6 +8,7 @@ const isStash =
 const isShadowRocket = 'undefined' !== typeof $rocket;
 const isEgern = 'object' == typeof egern;
 const isLanceX = 'undefined' != typeof $native;
+const isGUIforCores = typeof $Plugins !== 'undefined';
 
 export class OpenAPI {
     constructor(name = 'untitled', debug = false) {
@@ -48,7 +49,10 @@ export class OpenAPI {
             this.cache = JSON.parse($prefs.valueForKey(this.name) || '{}');
         if (isLoon || isSurge)
             this.cache = JSON.parse($persistentStore.read(this.name) || '{}');
-
+        if (isGUIforCores)
+            this.cache = JSON.parse(
+                $Plugins.SubStoreCache.get(this.name) || '{}',
+            );
         if (isNode) {
             // create a json for root cache
             const basePath =
@@ -86,6 +90,7 @@ export class OpenAPI {
         const data = JSON.stringify(this.cache, null, 2);
         if (isQX) $prefs.setValueForKey(data, this.name);
         if (isLoon || isSurge) $persistentStore.write(data, this.name);
+        if (isGUIforCores) $Plugins.SubStoreCache.set(this.name, data);
         if (isNode) {
             const basePath =
                 eval('process.env.SUB_STORE_DATA_BASE_PATH') || '.';
@@ -118,6 +123,9 @@ export class OpenAPI {
             if (isNode) {
                 this.root[key] = data;
             }
+            if (isGUIforCores) {
+                return $Plugins.SubStoreCache.set(key, data);
+            }
         } else {
             this.cache[key] = data;
         }
@@ -137,6 +145,9 @@ export class OpenAPI {
             if (isNode) {
                 return this.root[key];
             }
+            if (isGUIforCores) {
+                return $Plugins.SubStoreCache.get(key);
+            }
         } else {
             return this.cache[key];
         }
@@ -155,6 +166,9 @@ export class OpenAPI {
             if (isNode) {
                 delete this.root[key];
             }
+            if (isGUIforCores) {
+                return $Plugins.SubStoreCache.remove(key);
+            }
         } else {
             delete this.cache[key];
         }
@@ -220,6 +234,9 @@ export class OpenAPI {
                     });
             }
         }
+        if (isGUIforCores) {
+            $Plugins.Notify(title, subtitle + '\n' + content);
+        }
     }
 
     // other helper functions
@@ -240,7 +257,7 @@ export class OpenAPI {
     }
 
     done(value = {}) {
-        if (isQX || isLoon || isSurge) {
+        if (isQX || isLoon || isSurge || isGUIforCores) {
             $done(value);
         } else if (isNode) {
             if (typeof $context !== 'undefined') {
@@ -262,11 +279,12 @@ export function ENV() {
         isShadowRocket,
         isEgern,
         isLanceX,
+        isGUIforCores,
     };
 }
 
 export function HTTP(defaultOptions = { baseURL: '' }) {
-    const { isQX, isLoon, isSurge, isNode } = ENV();
+    const { isQX, isLoon, isSurge, isNode, isGUIforCores } = ENV();
     const methods = [
         'GET',
         'POST',
@@ -356,6 +374,24 @@ export function HTTP(defaultOptions = { baseURL: '' }) {
                         });
                 });
             });
+        } else if (isGUIforCores) {
+            worker = new Promise(async (resolve, reject) => {
+                try {
+                    const response = await $Plugins.Requests({
+                        method,
+                        url: options.url,
+                        headers: options.headers,
+                        body: options.body,
+                    });
+                    resolve({
+                        statusCode: response.status,
+                        headers: response.headers,
+                        body: response.body,
+                    });
+                } catch (error) {
+                    reject(error);
+                }
+            });
         }
 
         let timeoutid;

scripts/demo.js

@@ -39,6 +39,7 @@ function operator(proxies = [], targetPlatform, context) {
   //     yaml, // yaml 解析和生成
   //     getFlag, // 获取 emoji 旗帜
   //     getISO, // 获取 ISO 3166-1 alpha-2 代码
+  //     Gist, // Gist 类
   // }
 
   // 示例: 给节点名添加前缀
@@ -94,6 +95,42 @@ function operator(proxies = [], targetPlatform, context) {
   //     produceType: 'internal' // 'internal' produces an Array, otherwise produces a String( ProxyUtils.yaml.safeLoad('YAML String').proxies )
   // })
 
+  // 4. 一个比较折腾的方案: 在脚本操作中, 把内容同步到另一个 gist
+
+  // async function operator(proxies = []) {
+  //   const $ = $substore
+  //   const GITHUB_TOKEN = 'ghp_xxxxxxxxxxxxxxxxxxxxx'
+  //   const GIST_NAME = 'share'
+  //   const FILENAME = 'mihomo.yaml'
+  //   let files = {}
+  //   let content = await produceArtifact({
+  //     type: 'subscription',
+  //     subscription: {},
+  //     content: 'proxies:\n' + proxies.map((proxy) => '  - ' + JSON.stringify(proxy) + '\n').join(''),
+  //     platform: 'ClashMeta',
+  //   })
+  //   const manager = new ProxyUtils.Gist({
+  //       token: GITHUB_TOKEN,
+  //       key: GIST_NAME,
+  //   });
+  //   files[encodeURIComponent(FILENAME)] = {
+  //       content,
+  //   };
+  //   const res = await manager.upload(files);
+  //   let body = {};
+  //   try {
+  //       body = JSON.parse(res.body);
+  //       // eslint-disable-next-line no-empty
+  //   } catch (e) {}
+  //   const raw_url =
+  //   body.files[encodeURIComponent(FILENAME)]?.raw_url;
+  //   console.log(raw_url)
+  //   const new_url = raw_url?.replace(/\/raw\/[^/]*\/(.*)/, '/raw/$1');
+  //   console.log(new_url)
+  //   $.notify('🌍 Sub-Store', `更新到 Gist: ${new_url}`);
+  //   return proxies
+  // }
+
   // // YAML
   // ProxyUtils.yaml.load('YAML String')
   // ProxyUtils.yaml.safeLoad('YAML String')