Merge pull request #45 from daeuniverse/main

Fork Sync: Update from parent repository

.github/workflows/pick-build.yml

@@ -1,5 +1,5 @@
 name: Pick Build (Preview)
-run-name: 'Build to ${{ github.event.inputs.daed }}-${{ github.event.inputs.wing }}-${{ github.event.inputs.dae-core }}'
+run-name: 'Build to ${{ github.event.inputs.daed }}-${{ github.event.inputs.wing }}-${{ github.event.inputs.dae-core }}(${{ github.event.inputs.dae-core-remote }})'
 
 on:
   workflow_dispatch:
@@ -11,11 +11,15 @@ on:
       wing:
         description: 'Commit ID or branch name for wing'
         required: false
-        default: 'main'
+        default: 'remotes/origin/main'
       dae-core:
         description: 'Commit ID or branch name for dae-core'
         required: false
-        default: 'main'
+        default: 'remotes/origin/main'
+      dae-core-remote:
+        description: 'Remote address of dae-core'
+        required: false
+        default: 'https://github.com/daeuniverse/dae.git'
 
 jobs:
   checkout-full-src:
@@ -37,7 +41,7 @@ jobs:
           git checkout ${{ github.event.inputs.wing }}
           export GOMODCACHE="${PWD}"/go-mod
           go mod download -modcacherw
-          cd dae-core && git checkout ${{ github.event.inputs.dae-core }} && go mod download -modcacherw && cd ..
+          cd dae-core && git remote set-url origin ${{ github.event.inputs.dae-core-remote }} && git fetch origin && git checkout ${{ github.event.inputs.dae-core }} && go mod download -modcacherw && cd ..
           find "$GOMODCACHE" -maxdepth 1 ! -name "cache" ! -name "go-mod" -exec rm -rf {} \;
           sed -i 's/#export GOMODCACHE=$(PWD)\/go-mod/export GOMODCACHE=$(PWD)\/go-mod/' Makefile
         working-directory: wing
@@ -165,7 +169,7 @@ jobs:
         run: |
           git submodule update --init --recursive
           cd wing && git reset --hard ${{ github.event.inputs.wing }} && go mod download -modcacherw
-          cd dae-core && git reset --hard ${{ github.event.inputs.dae-core }} && cd .. && go mod tidy && cd ..
+          cd dae-core && git remote set-url origin ${{ github.event.inputs.dae-core-remote }} && git fetch origin && git reset --hard ${{ github.event.inputs.dae-core }} && cd .. && go mod tidy && cd ..
 
       - name: Get the version
         id: get_version

CHANGELOGS.md

@@ -14,6 +14,7 @@ curl --silent "https://api.github.com/repos/daeuniverse/daed/releases" | jq -r '
 
 <!-- BEGIN NEW TOC ENTRY -->
 
+- [v0.7.0rc1.1 (Pre-Latest)](#v070rc1.1-pre-release)
 - [v0.6.0 (Latest)](#v060-latest)
 - [v0.4.1](#v041)
 - [v0.4.0rc1](#v040rc1)
@@ -28,6 +29,22 @@ curl --silent "https://api.github.com/repos/daeuniverse/daed/releases" | jq -r '
 - [v0.1.0rc1](#v010rc1)
 <!-- BEGIN NEW CHANGELOGS -->
 
+### v0.7.0rc1 (Pre-release)
+
+> Release date: 2024/06/16
+
+#### Features
+
+- feat: add configure hysteria2 modal [#440](https://github.com/daeuniverse/daed/pull/440) by (@wanlce)
+- ci/feat: support customized git remote for Pick Build [#441](https://github.com/daeuniverse/daed/pull/441) by (@mzz2017)
+
+#### Others
+
+- chore(sync): keep upstream source up-to-date [#442](https://github.com/daeuniverse/daed/pull/442) by (@dae-prow[bot])
+- ci(docker): update go version to 1.22 [#445](https://github.com/daeuniverse/daed/pull/445) by (@wanlce)
+
+**Full Changelog**: https://github.com/daeuniverse/daed/compare/v0.6.0...v0.7.0rc1
+
 ### v0.6.0 (Latest)
 
 > Release date: 2024/06/14

publish.Dockerfile

@@ -2,7 +2,7 @@
 
 ARG DAED_VERSION
 
-FROM golang:1.21-bookworm as build
+FROM golang:1.22-bookworm as build
 
 RUN \
     apt-get update; apt-get install -y git make llvm-15 clang-15; \

src/components/ConfigureNodeFormModal/Hysteria2Form.tsx

@@ -0,0 +1,58 @@
+import { Checkbox, NumberInput, TextInput } from '@mantine/core'
+import { useForm, zodResolver } from '@mantine/form'
+import { useTranslation } from 'react-i18next'
+import { z } from 'zod'
+
+import { FormActions } from '~/components/FormActions'
+import { DEFAULT_HYSTERIA2_FORM_VALUES, hysteria2Schema } from '~/constants'
+import { generateHysteria2URL } from '~/utils'
+
+export const Hysteria2Form = ({ onLinkGeneration }: { onLinkGeneration: (link: string) => void }) => {
+  const { t } = useTranslation()
+  const { onSubmit, getInputProps, reset } = useForm<z.infer<typeof hysteria2Schema>>({
+    initialValues: DEFAULT_HYSTERIA2_FORM_VALUES,
+    validate: zodResolver(hysteria2Schema),
+  })
+
+  const handleSubmit = onSubmit((values) => {
+    /* hysteria2://[auth@]hostname[:port]/?[key=value]&[key=value]... */
+    const query = {
+      obfs: values.obfs,
+      obfsPassword: values.obfsPassword,
+      sni: values.sni,
+      insecure: values.allowInsecure,
+      pinSHA256: values.pinSHA256,
+    }
+
+    return onLinkGeneration(
+      generateHysteria2URL({
+        protocol: 'hysteria2',
+        auth: values.auth,
+        host: values.server,
+        port: values.port,
+        params: query,
+      }),
+    )
+  })
+
+  return (
+    <form onSubmit={handleSubmit}>
+      <TextInput label={t('configureNode.name')} {...getInputProps('name')} />
+      <TextInput label={t('configureNode.host')} withAsterisk {...getInputProps('server')} />
+      <NumberInput label={t('configureNode.port')} withAsterisk min={0} max={65535} {...getInputProps('port')} />
+      <TextInput label="Auth" withAsterisk {...getInputProps('auth')} />
+      {/* The obfuscation feature has not been implemented yet
+      <Select
+        label={t('configureNode.obfs')}
+        data={[{ label: 'salamander', value: 'salamander' }]}
+        {...getInputProps('obfs')}
+      />
+      <TextInput label={t('configureNode.obfsPassword')} {...getInputProps('obfsPassword')} />
+      */}
+      <TextInput label="SNI" {...getInputProps('sni')} />
+      <TextInput label="Pin SHA256" {...getInputProps('pinSHA256')} />
+      <Checkbox label={t('allowInsecure')} {...getInputProps('allowInsecure', { type: 'checkbox' })} />
+      <FormActions reset={reset} />
+    </form>
+  )
+}

src/components/ConfigureNodeFormModal/index.tsx

@@ -6,6 +6,7 @@ import { z } from 'zod'
 import { useImportNodesMutation } from '~/apis'
 
 import { HTTPForm } from './HTTPForm'
+import { Hysteria2Form } from './Hysteria2Form'
 import { JuicityForm } from './JuicityForm'
 import { SSForm } from './SSForm'
 import { SSRForm } from './SSRForm'
@@ -64,6 +65,7 @@ export const ConfigureNodeFormModal = ({ opened, onClose }: { opened: boolean; o
             <Tabs.Tab value="ssr">SSR</Tabs.Tab>
             <Tabs.Tab value="trojan">Trojan</Tabs.Tab>
             <Tabs.Tab value="juicity">Juicity</Tabs.Tab>
+            <Tabs.Tab value="hysteria2">Hysteria2</Tabs.Tab>
             <Tabs.Tab value="tuic">Tuic</Tabs.Tab>
             <Tabs.Tab value="http">HTTP</Tabs.Tab>
             <Tabs.Tab value="socks5">SOCKS5</Tabs.Tab>
@@ -99,6 +101,12 @@ export const ConfigureNodeFormModal = ({ opened, onClose }: { opened: boolean; o
             </Stack>
           </Tabs.Panel>
 
+          <Tabs.Panel value="hysteria2">
+            <Stack>
+              <Hysteria2Form onLinkGeneration={onLinkGeneration} />
+            </Stack>
+          </Tabs.Panel>
+
           <Tabs.Panel value="tuic">
             <Stack>
               <TuicForm onLinkGeneration={onLinkGeneration} />

src/constants/default.ts

@@ -5,6 +5,7 @@ import { GlobalInput, Policy } from '~/schemas/gql/graphql'
 import { DialMode, LogLevel, TLSImplementation, TcpCheckHttpMethod, UTLSImitate } from './misc'
 import {
   httpSchema,
+  hysteria2Schema,
   juicitySchema,
   socks5Schema,
   ssSchema,
@@ -169,6 +170,18 @@ export const DEFAULT_JUICITY_FORM_VALUES: z.infer<typeof juicitySchema> = {
   sni: '',
 }
 
+export const DEFAULT_HYSTERIA2_FORM_VALUES: z.infer<typeof hysteria2Schema> = {
+  name: '',
+  port: 443,
+  server: '',
+  auth: '',
+  obfs: '',
+  obfsPassword: '',
+  sni: '',
+  allowInsecure: false,
+  pinSHA256: '',
+}
+
 export const DEFAULT_HTTP_FORM_VALUES: z.infer<typeof httpSchema> = {
   host: '',
   name: '',

src/constants/schema.ts

@@ -118,6 +118,18 @@ export const juicitySchema = z.object({
   congestion_control: z.string(),
 })
 
+export const hysteria2Schema = z.object({
+  name: z.string(),
+  server: z.string().nonempty(),
+  port: z.number().min(0).max(65535),
+  auth: z.string(),
+  obfs: z.string(),
+  obfsPassword: z.string(),
+  sni: z.string(),
+  allowInsecure: z.boolean(),
+  pinSHA256: z.string(),
+})
+
 export const httpSchema = z.object({
   username: z.string(),
   password: z.string(),

src/i18n/locales/en.json

@@ -53,6 +53,7 @@
     "noObfuscation": "No obfuscation",
     "obfs": "Obfuscation",
     "obfsParam": "Obfs Param",
+    "obfsPassword": "Obfs Password",
     "origin": "origin",
     "password": "Password",
     "path": "Path",

src/i18n/locales/zh-Hans.json

@@ -53,6 +53,7 @@
     "noObfuscation": "不伪装",
     "obfs": "混淆",
     "obfsParam": "混淆参数",
+    "obfsPassword": "混淆密码",
     "origin": "原版",
     "password": "密码",
     "path": "路径",

src/utils/node.ts

@@ -29,3 +29,29 @@ export const generateURL = ({ username, password, protocol, host, port, params,
 
   return uri.toString()
 }
+
+export const generateHysteria2URL = ({
+  protocol,
+  auth,
+  host,
+  port,
+  params,
+}: {
+  protocol: string
+  auth: string
+  host: string
+  port: number
+  params: Record<string, string | number | boolean>
+}) => {
+  // Encode the auth field to handle special characters like '@'
+  const encodedAuth = encodeURIComponent(auth)
+  const uri = new URL(`${protocol}://${encodedAuth}@${host}:${port}/`)
+
+  Object.entries(params).forEach(([key, value]) => {
+    if (value !== null && value !== undefined && value !== '') {
+      uri.searchParams.append(key, String(value))
+    }
+  })
+
+  return uri.toString()
+}