Skip to content
This repository has been archived by the owner on Jan 4, 2023. It is now read-only.

Ability to use intermediate server #109

Open
wants to merge 101 commits into
base: main
Choose a base branch
from

Conversation

amir215909
Copy link

Changed

  • Improved inbound apis schema
  • Separated Front-end and Back-end endpoint controllers
  • Improved code quality by using DTOs

Added

  • Mirrors for replacing ip and port of config to use intermediate server

@amir215909
Copy link
Author

1- delete the bin folder from your PR also files that are not used like .env, web/config.js 2- can't find where use ip-address.min.js 3 - also please revert axios.min.js to base

I've talked to @rgo412, he is changing the requested changes.

@amir215909
Copy link
Author

Changes are made.

@hossinasaadi
Copy link
Owner

Changes are made.

Thank you @amir215909, would you please answer the review questions up there?

@amir215909
Copy link
Author

Changes are made.

Thank you @amir215909, would you please answer the review questions up there?

I couldn't find any questions

web/controller/inbound.go Outdated Show resolved Hide resolved
web/html/xui/common_sider.html Show resolved Hide resolved
web/html/xui/mirrors.html Show resolved Hide resolved
web/html/xui/form/protocol/vless.html Outdated Show resolved Hide resolved
web/service/mirror/indexService.go Outdated Show resolved Hide resolved
web/html/xui/mirrors.html Outdated Show resolved Hide resolved
@hossinasaadi
Copy link
Owner

Changes are made.

Thank you @amir215909, would you please answer the review questions up there?

I couldn't find any questions

my bad, you can see them now

@hossinasaadi
Copy link
Owner

@amir215909 @rezaUniqe @rgo412 thanks for fixing these issues, so I'm checking your fork and notifying you about some changes :/, cause have more conflicts here

@hossinasaadi
Copy link
Owner

1- please check this PR that make conflicts with vmess.html & vless.html files even trojan.html
2- trojan multi-user that you add doesn't implement Random Email & client traffic reset
also, the trojan first client password field is duplicate! (one out of client collapse, one inside)
To fix these 2 problems please rebase vmess.html & vless.html and made your changes. also for trojan
some conflicts like :
Screenshot from 2022-11-23 09-24-55

3- when clicking on Log IP to get IPs, returns a 404 error cause of changing Endpoints
4- when creating a mirror or any inbound don't get any response message as an error or success.
that's i found till now :) , i check it more
ty

<a-form layout="inline">
<a-form-item label='{{ i18n "password" }}'>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1- are you deleting password from trojan?
2- trojan doesn't have any id field!
3-inbound.settings.clients[0].flow should be in each client no just first one

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hi, I added the password field for each client also I added xtls flow to each client inside add client inbox and I didn't quite understand the id field you mentioned there is an id field in add client for each client is there something I missing?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean as you see here https://github.com/hossinasaadi/x-ui/blob/main/web/html/xui/form/protocol/trojan.html
the trojan protocol just has a password and flow! not uuid(id) and alterID field.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

constructor(password=RandomUtil.randomSeq(10), flow=FLOW_CONTROL.DIRECT) {

this is base trojan client and you actually make mistake here, just compare it with your files.

web/assets/js/util/utils.js Outdated Show resolved Hide resolved
Repository owner locked as off-topic and limited conversation to collaborators Dec 25, 2022
Repository owner deleted a comment from shuvvan Dec 25, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants