Merge remote-tracking branch 'origin/master' into master

Author: BobCoderS9

src/Utils/AppURI.php

@@ -56,7 +56,7 @@ public static function getV2RayNURI(array $item)
         $return = null;
         switch ($item['type']) {
             case 'vmess':
-                if ((string)$item['vtype'] == "vmess://") {
+                if (isset($item['vtype']) && (string)$item['vtype'] == "vmess://") {
                     $node = [
                         'v' => "2",
                         'ps' => $item['remark'],

src/Utils/Tools.php

@@ -560,10 +560,9 @@ public static function v2Array($node)
             }else{
                 $item['enable_xtls'] = "";
             }
+            $item['vtype'] = 'vmess://';
             if (array_key_exists('enable_vless', $item)) {
                 $item['vtype'] = 'vless://';
-            } else {
-                $item['vtype'] = 'vmess://';
             }
             if (!array_key_exists('sni', $item)) {
                 $item['sni'] = $item['host'];