From da90ea106b80beb4a72674755ea4da60c5b8530d Mon Sep 17 00:00:00 2001
From: Alpha Kane <betaxab@gmail.com>
Date: Fri, 7 Jan 2022 03:35:24 +0800
Subject: [PATCH] ServerService: update v2ray configuration

---
 app/Services/ServerService.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/Services/ServerService.php b/app/Services/ServerService.php
index e2a43a9e..0dc1ceca 100644
--- a/app/Services/ServerService.php
+++ b/app/Services/ServerService.php
@@ -13,7 +13,7 @@ use Illuminate\Support\Facades\Cache;
 class ServerService
 {
 
-    CONST V2RAY_CONFIG = '{"api":{"services":["HandlerService","StatsService"],"tag":"api"},"dns":{},"stats":{},"inbounds":[{"port":443,"protocol":"vmess","settings":{"clients":[]},"sniffing":{"enabled":true,"destOverride":["http","tls"]},"streamSettings":{"network":"tcp"},"tag":"proxy"},{"listen":"127.0.0.1","port":23333,"protocol":"dokodemo-door","settings":{"address":"0.0.0.0"},"tag":"api"}],"log":{"loglevel":"debug","access":"access.log","error":"error.log"},"outbounds":[{"protocol":"freedom","settings":{}},{"protocol":"blackhole","settings":{},"tag":"block"}],"routing":{"rules":[{"inboundTag":"api","outboundTag":"api","type":"field"}]},"policy":{"levels":{"0":{"handshake":4,"connIdle":300,"uplinkOnly":5,"downlinkOnly":30,"statsUserUplink":true,"statsUserDownlink":true}}}}';
+    CONST V2RAY_CONFIG = '{"log":{"loglevel":"debug","access":"access.log","error":"error.log"},"api":{"services":["HandlerService","StatsService"],"tag":"api"},"dns":{},"stats":{},"inbounds":[{"port":443,"protocol":"vmess","settings":{"clients":[]},"sniffing":{"enabled":true,"destOverride":["http","tls"]},"streamSettings":{"network":"tcp"},"tag":"proxy"},{"listen":"127.0.0.1","port":23333,"protocol":"dokodemo-door","settings":{"address":"0.0.0.0"},"tag":"api"}],"outbounds":[{"protocol":"freedom","settings":{}},{"protocol":"blackhole","settings":{},"tag":"block"}],"routing":{"rules":[{"type":"field","inboundTag":"api","outboundTag":"api"}]},"policy":{"levels":{"0":{"handshake":4,"connIdle":300,"uplinkOnly":5,"downlinkOnly":30,"statsUserUplink":true,"statsUserDownlink":true}}}}';
     CONST TROJAN_CONFIG = '{"run_type":"server","local_addr":"0.0.0.0","local_port":443,"remote_addr":"www.taobao.com","remote_port":80,"password":[],"ssl":{"cert":"server.crt","key":"server.key","sni":"domain.com"},"api":{"enabled":true,"api_addr":"127.0.0.1","api_port":10000}}';
     public function getV2ray(User $user, $all = false):array
     {
@@ -165,7 +165,7 @@ class ServerService
                 array_push($dns->servers, 'localhost');
             }
             $json->dns = $dns;
-            $json->outbound[0]->settings->domainStrategy = 'UseIP';
+            $json->outbounds[0]->settings->domainStrategy = 'UseIP';
         }
     }
 
@@ -174,25 +174,25 @@ class ServerService
         if ($server->networkSettings) {
             switch ($server->network) {
                 case 'tcp':
-                    $json->inbound[0]->streamSettings->tcpSettings = $server->networkSettings;
+                    $json->inbounds[0]->streamSettings->tcpSettings = $server->networkSettings;
                     break;
                 case 'kcp':
-                    $json->inbound[0]->streamSettings->kcpSettings = $server->networkSettings;
+                    $json->inbounds[0]->streamSettings->kcpSettings = $server->networkSettings;
                     break;
                 case 'ws':
-                    $json->inbound[0]->streamSettings->wsSettings = $server->networkSettings;
+                    $json->inbounds[0]->streamSettings->wsSettings = $server->networkSettings;
                     break;
                 case 'http':
-                    $json->inbound[0]->streamSettings->httpSettings = $server->networkSettings;
+                    $json->inbounds[0]->streamSettings->httpSettings = $server->networkSettings;
                     break;
                 case 'domainsocket':
-                    $json->inbound[0]->streamSettings->dsSettings = $server->networkSettings;
+                    $json->inbounds[0]->streamSettings->dsSettings = $server->networkSettings;
                     break;
                 case 'quic':
-                    $json->inbound[0]->streamSettings->quicSettings = $server->networkSettings;
+                    $json->inbounds[0]->streamSettings->quicSettings = $server->networkSettings;
                     break;
                 case 'grpc':
-                    $json->inbound[0]->streamSettings->grpcSettings = $server->networkSettings;
+                    $json->inbounds[0]->streamSettings->grpcSettings = $server->networkSettings;
                     break;
             }
         }
@@ -242,19 +242,19 @@ class ServerService
     {
         if ((int)$server->tls) {
             $tlsSettings = $server->tlsSettings;
-            $json->inbound[0]->streamSettings->security = 'tls';
+            $json->inbounds[0]->streamSettings->security = 'tls';
             $tls = (object)[
                 'certificateFile' => '/root/.cert/server.crt',
                 'keyFile' => '/root/.cert/server.key'
             ];
-            $json->inbound[0]->streamSettings->tlsSettings = new \StdClass();
+            $json->inbounds[0]->streamSettings->tlsSettings = new \StdClass();
             if (isset($tlsSettings->serverName)) {
-                $json->inbound[0]->streamSettings->tlsSettings->serverName = (string)$tlsSettings->serverName;
+                $json->inbounds[0]->streamSettings->tlsSettings->serverName = (string)$tlsSettings->serverName;
             }
             if (isset($tlsSettings->allowInsecure)) {
-                $json->inbound[0]->streamSettings->tlsSettings->allowInsecure = (int)$tlsSettings->allowInsecure ? true : false;
+                $json->inbounds[0]->streamSettings->tlsSettings->allowInsecure = (int)$tlsSettings->allowInsecure ? true : false;
             }
-            $json->inbound[0]->streamSettings->tlsSettings->certificates[0] = $tls;
+            $json->inbounds[0]->streamSettings->tlsSettings->certificates[0] = $tls;
         }
     }