some fix and small features #961

M03ED · 2024-04-28T17:55:18Z

fix:

report change status temporary Telegram bot doesn't work properly #845
accept unix domain Not supported Unix domain socket listener #931
days left for expired users عدم نمایش صحیح زمان باقی مانده از اکانت #903
fragment field in streisand مشکل در فرگمنت #924 وارد کردن لینک اشتراک در هیدیفای نکست #827
early data for clash HTTPUpgrade and Early Data for Clash.Meta #896
kcp for v2ray json
quic for v2ray json quic bugs #886

feat:

add spiderx Add "SpiderX" for reality protocol #957
add multi mode for grpc multi custom config for v2rayN & gRPC updates #885 Multi mode - grpc #641
add json config for v2rayn Support grpc mode - gun or multi #659

refactor:

V2rayShareLink class usage
remove external if else in share.py

fodhelper · 2024-04-29T15:02:41Z

gRPC is changes in latest versions of Xray-core, check this : XTLS/Xray-core#1815

There is 3 different type of gRPC server configs :
gRPC Gun (Supported on all clients)
gRPC Multi (Supported only on Xray-core based clients)
gRPC 2 in 1 Inbound: Both types in 1 inbound with Custom Path, for this one Marzban should parse Inbound's serviceName and use Multi for Xray based clients, and Gun for other clients

And network name for gRPC can be 'grpc' or 'gun'
other network names have aliases too. check this :
https://github.com/XTLS/Xray-core/blob/51504c624c4aa9c093cf607cfca16e9548743af0/infra/conf/transport_internet.go#L631

M03ED · 2024-04-29T17:14:49Z

gRPC is changes in latest versions of Xray-core, check this : XTLS/Xray-core#1815

ok so we can have this type of grpc with "network": "grpc" or have normal grpc with "network": "gun" right ?

fodhelper · 2024-04-29T20:30:19Z

network 'gun' and network 'grpc' are same thing, one transport with multiple aliases

M03ED · 2024-04-30T11:57:13Z

gRPC is changes in latest versions of Xray-core, check this : XTLS/Xray-core#1815

There is 3 different type of gRPC server configs : gRPC Gun (Supported on all clients) gRPC Multi (Supported only on Xray-core based clients) gRPC 2 in 1 Inbound: Both types in 1 inbound with Custom Path, for this one Marzban should parse Inbound's serviceName and use Multi for Xray based clients, and Gun for other clients

And network name for gRPC can be 'grpc' or 'gun' other network names have aliases too. check this : https://github.com/XTLS/Xray-core/blob/51504c624c4aa9c093cf607cfca16e9548743af0/infra/conf/transport_internet.go#L631

done.

fodhelper · 2024-04-30T16:38:46Z

Please revert "feat: support gRPC Custom Path", it's wrong

We must check if path is started with "/" or not
If it's not started with "/" then we must send path like before to all clients

But if it's started with "/" we must split it in serviceName and streamName(Gun) and streamName(Multi)
Example path = "/custom/path/GunCustomPath|MultiCustomPath"
serviceName = custom/path
streamName(Gun) = GunCustomPath
streamName(Multi) = MultiCustomPath

now for Xray based clients we must send the full path ("/custom/path/GunCustomPath|MultiCustomPath")
in sharelink, this path must get urlEncoded
https://github.com/XTLS/Xray-core/releases/tag/v1.8.9
But for v2ray json config i think there is no need to urlEncode the path (must test it)

And when user uses this type of Path for gRPC, it does not mean MultiMode is Enabled, it could be disabled
This type of path only means we use custom streamName

For Clash.Meta and Sing-Box Gun mode will only work if streamName(Gun) is euqal to "Tun"
And we must send path to them like old type of configs (without the first "/" and without /streamName)

fodhelper · 2024-04-30T22:13:45Z

You can add randomUserAgent function to the new function file

import random

# Source: https://cdn.jsdelivr.net/gh/microlinkhq/top-user-agents@master/src/index.json
UserAgentList = [
  "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36",
  "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36",
  "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36"
]

def genRandUserAgent():
  return random.choice(UserAgentList)

print(genRandUserAgent())

You can add all 100 user agents from the url and update user agent list later too, but making many requests to jsdelivr cdn is not good, they may have or add a rate limit or block our server's ip

gRPC supports custom user-agent too, with user agent and authority of grpc we can use it with no tls and remain undetected

M03ED · 2024-05-03T22:13:05Z

Please revert "feat: support gRPC Custom Path", it's wrong

We must check if path is started with "/" or not If it's not started with "/" then we must send path like before to all clients

But if it's started with "/" we must split it in serviceName and streamName(Gun) and streamName(Multi) Example path = "/custom/path/GunCustomPath|MultiCustomPath" serviceName = custom/path streamName(Gun) = GunCustomPath streamName(Multi) = MultiCustomPath

now for Xray based clients we must send the full path ("/custom/path/GunCustomPath|MultiCustomPath") in sharelink, this path must get urlEncoded https://github.com/XTLS/Xray-core/releases/tag/v1.8.9 But for v2ray json config i think there is no need to urlEncode the path (must test it)

And when user uses this type of Path for gRPC, it does not mean MultiMode is Enabled, it could be disabled This type of path only means we use custom streamName

For Clash.Meta and Sing-Box Gun mode will only work if streamName(Gun) is euqal to "Tun" And we must send path to them like old type of configs (without the first "/" and without /streamName)

this is what they provide as a sample

server side :

"serviceName": "/my/sample/path/customTun|customTunMulti"

client without multi:

"serviceName": "/my/sample/path/customTun",
"multiMode": false

client with multi tun:

"serviceName": "/my/sample/path/customTunMulti",
"multiMode": true

if you don't want to use multi mode without conflict with not xray based client you can just use normal grpc
we already sending path like before , only thing we do its separating grpc path for xray based clients and other ones
but i cant change that custom to be really custom

i'm not sure what you what you mean by urlEncode , we have different type of that

fodhelper · 2024-05-04T05:34:57Z

but i cant change that custom to be really custom

check this :

def get_grpc_gun(input: str):
    if not input.startswith("/"):
        return input
    
    servicename = input.rsplit("/", 1)[0]
    streamname = input.rsplit("/", 1)[1].split("|")[0]
    
    if streamname == "Tun":
        return servicename[1:]
    
    return "%s%s%s" % (servicename, "/", streamname)

def get_grpc_multi(input: str):
    if not input.startswith("/"):
        return input
    
    servicename = input.rsplit("/", 1)[0]
    streamname = input.rsplit("/", 1)[1].split("|")[1]

    return "%s%s%s" % (servicename, "/", streamname)

print(get_grpc_gun("oldPath"))
print(get_grpc_gun("/newPath/Tun|MultiCustomPath"))
print(get_grpc_gun("/new/path/GunCustomPath|MultiCustomPath"))

print(get_grpc_multi("oldPath"))
print(get_grpc_multi("/new/path/GunCustomPath|MultiCustomPath"))

i'm not sure what you what you mean by urlEncode , we have different type of that

In xray-core tag 1.8.9 written encodeURIComponent
https://github.com/XTLS/Xray-core/releases/tag/v1.8.9
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent
so it must be

from urllib.parse import quote

print(quote("/my/path", safe="-_.!~*'()"))

M03ED · 2024-05-04T09:14:36Z

so for not xray based clients we use get_grpc_gun and for xray based if multimode was enable we use get_grpc_multi?

M03ED · 2024-05-04T09:18:08Z

and i can't find any user agent option for grpc

fodhelper · 2024-05-04T22:29:45Z

so for not xray based clients we use get_grpc_gun and for xray based if multimode was enable we use get_grpc_multi?

exactly
If multiMode is disabled >> get_grpc_gun (for all clients)
if multiMode is enabled >> get_grpc_multi (for xray based clients) and get_grpc_gun (for other clients)

and i can't find any user agent option for grpc

They added it in https://github.com/XTLS/Xray-core/pull/1790/files
But they didn't added it in docs because it's useless! as no browser uses gRPC so using a user-agent of browser is useless
no *ray client supports it too, so we must leave it for now

M03ED · 2024-05-30T11:53:05Z

i fix grpc and add encode for service name start with /

M03ED · 2024-06-07T14:07:10Z

@SaintShit

M03ED added 11 commits April 28, 2024 15:02

fix: report change status temporary

cff6f67

fix: accept unix domain

3d0e3da

feat: add spiderx

dee8f81

fix: days left for expired users

3d7872b

feat: add multi mode for grpc

12b21b1

fix: early data for clash

af1593f

fix: kcp for v2ray json

17070e3

fix: spiderx bug

2a68c87

feat: add json config for v2rayn

98ee34f

refactor: V2rayShareLink usage

13f3374

fix: status change for not on hold users

41ae408

feat: support gRPC Custom Path

dae8eb8

fix: remove level and set it to default

fb2f01e

M03ED added 2 commits May 30, 2024 15:13

fix: grpc encode

967fdf0

Merge remote-tracking branch 'upstream/dev' into 1.8.11

d4bf466

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

some fix and small features #961

some fix and small features #961

M03ED commented Apr 28, 2024 •

edited

fodhelper commented Apr 29, 2024 •

edited

M03ED commented Apr 29, 2024

fodhelper commented Apr 29, 2024

M03ED commented Apr 30, 2024

fodhelper commented Apr 30, 2024 •

edited

fodhelper commented Apr 30, 2024

M03ED commented May 3, 2024 •

edited

fodhelper commented May 4, 2024

M03ED commented May 4, 2024

M03ED commented May 4, 2024

fodhelper commented May 4, 2024

M03ED commented May 30, 2024

M03ED commented Jun 7, 2024

some fix and small features #961

Are you sure you want to change the base?

some fix and small features #961

Conversation

M03ED commented Apr 28, 2024 • edited

fodhelper commented Apr 29, 2024 • edited

M03ED commented Apr 29, 2024

fodhelper commented Apr 29, 2024

M03ED commented Apr 30, 2024

fodhelper commented Apr 30, 2024 • edited

fodhelper commented Apr 30, 2024

M03ED commented May 3, 2024 • edited

fodhelper commented May 4, 2024

M03ED commented May 4, 2024

M03ED commented May 4, 2024

fodhelper commented May 4, 2024

M03ED commented May 30, 2024

M03ED commented Jun 7, 2024

M03ED commented Apr 28, 2024 •

edited

fodhelper commented Apr 29, 2024 •

edited

fodhelper commented Apr 30, 2024 •

edited

M03ED commented May 3, 2024 •

edited