fix: 流量查询工作不正常

surgioproject · Apr 15, 2022 · 95ea0dc · 95ea0dc
1 parent 4b72c58
commit 95ea0dc
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 8 deletions.
diff --git a/lib/provider/ClashProvider.ts b/lib/provider/ClashProvider.ts
@@ -70,13 +70,16 @@ export default class ClashProvider extends Provider {
     return relayableUrl(this._url, this.relayUrl);
   }
 
-  public async getSubscriptionUserInfo(): Promise<
+  public async getSubscriptionUserInfo({
+    requestUserAgent,
+  }: { requestUserAgent?: string } = {}): Promise<
     SubscriptionUserinfo | undefined
   > {
     const { subscriptionUserinfo } = await getClashSubscription({
       url: this.url,
       udpRelay: this.udpRelay,
       tls13: this.tls13,
+      requestUserAgent: requestUserAgent || this.requestUserAgent,
     });
 
     if (subscriptionUserinfo) {

diff --git a/lib/provider/Provider.ts b/lib/provider/Provider.ts
@@ -162,9 +162,9 @@ export default class Provider {
   }
 
   // istanbul ignore next
-  public async getSubscriptionUserInfo(): Promise<
-    SubscriptionUserinfo | undefined
-  > {
+  public async getSubscriptionUserInfo({}: {
+    requestUserAgent?: string;
+  } = {}): Promise<SubscriptionUserinfo | undefined> {
     throw new Error('此 Provider 不支持该功能');
   }
 

diff --git a/lib/provider/ShadowsocksSubscribeProvider.ts b/lib/provider/ShadowsocksSubscribeProvider.ts
@@ -49,12 +49,15 @@ export default class ShadowsocksSubscribeProvider extends Provider {
     return relayableUrl(this._url, this.relayUrl);
   }
 
-  public async getSubscriptionUserInfo(): Promise<
+  public async getSubscriptionUserInfo({
+    requestUserAgent,
+  }: { requestUserAgent?: string } = {}): Promise<
     SubscriptionUserinfo | undefined
   > {
     const { subscriptionUserinfo } = await getShadowsocksSubscription(
       this.url,
       this.udpRelay,
+      requestUserAgent || this.requestUserAgent,
     );
 
     if (subscriptionUserinfo) {

diff --git a/lib/provider/ShadowsocksrSubscribeProvider.ts b/lib/provider/ShadowsocksrSubscribeProvider.ts
@@ -50,12 +50,15 @@ export default class ShadowsocksrSubscribeProvider extends Provider {
     return relayableUrl(this._url, this.relayUrl);
   }
 
-  public async getSubscriptionUserInfo(): Promise<
+  public async getSubscriptionUserInfo({
+    requestUserAgent,
+  }: { requestUserAgent?: string } = {}): Promise<
     SubscriptionUserinfo | undefined
   > {
     const { subscriptionUserinfo } = await getShadowsocksrSubscription(
       this.url,
       this.udpRelay,
+      requestUserAgent || this.requestUserAgent,
     );
 
     if (subscriptionUserinfo) {

diff --git a/lib/provider/SsdProvider.ts b/lib/provider/SsdProvider.ts
@@ -50,12 +50,15 @@ export default class SsdProvider extends Provider {
     return relayableUrl(this._url, this.relayUrl);
   }
 
-  public async getSubscriptionUserInfo(): Promise<
+  public async getSubscriptionUserInfo({
+    requestUserAgent,
+  }: { requestUserAgent?: string } = {}): Promise<
     SubscriptionUserinfo | undefined
   > {
     const { subscriptionUserinfo } = await getSsdSubscription(
       this.url,
       this.udpRelay,
+      requestUserAgent || this.requestUserAgent,
     );
 
     if (subscriptionUserinfo) {

diff --git a/lib/provider/TrojanProvider.ts b/lib/provider/TrojanProvider.ts
@@ -52,13 +52,16 @@ export default class TrojanProvider extends Provider {
     return relayableUrl(this._url, this.relayUrl);
   }
 
-  public async getSubscriptionUserInfo(): Promise<
+  public async getSubscriptionUserInfo({
+    requestUserAgent,
+  }: { requestUserAgent?: string } = {}): Promise<
     SubscriptionUserinfo | undefined
   > {
     const { subscriptionUserinfo } = await getTrojanSubscription({
       url: this.url,
       udpRelay: this.udpRelay,
       tls13: this.tls13,
+      requestUserAgent: requestUserAgent || this.requestUserAgent,
     });
 
     if (subscriptionUserinfo) {