FatttSnake/oxygen-desktop
1
0
Fork 0
Code Pull Requests Activity

Refactor(Protocol): Optimize desktop and app protocol

Browse Source
This commit is contained in:
Fat Snake
2024-05-21 17:41:57 +08:00
parent 3dc434a6ac
commit a7577373ef
8 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/global.d.ts vendored
View File

@@ -2,7 +2,8 @@ type Platform = 'WEB' | 'DESKTOP' | 'ANDROID'
interface ImportMetaEnv {
readonly VITE_PLATFORM: Platform
readonly VITE_PROTOCOL: string
readonly VITE_DESKTOP_PROTOCOL: string
readonly VITE_APP_PROTOCOL: string
readonly VITE_UI_URL: string
readonly VITE_API_URL: string
readonly VITE_API_TOKEN_URL: string

6
src/main/index.ts
View File

@@ -18,11 +18,11 @@ if (!app.isPackaged) {
args.push(path.resolve(process.argv[1]))
}
args.push('--')
app.setAsDefaultProtocolClient(import.meta.env.VITE_PROTOCOL, process.execPath, args)
// app.removeAsDefaultProtocolClient(import.meta.env.VITE_PROTOCOL, process.execPath, args)
app.setAsDefaultProtocolClient(import.meta.env.VITE_DESKTOP_PROTOCOL, process.execPath, args)
// app.removeAsDefaultProtocolClient(import.meta.env.VITE_DESKTOP_PROTOCOL, process.execPath, args)
const handleArgv = (argv: string[]) => {
const prefix = `${import.meta.env.VITE_PROTOCOL}:`
const prefix = `${import.meta.env.VITE_DESKTOP_PROTOCOL}:`
const offset = app.isPackaged ? 1 : 2
const url = argv.find((arg, index) => index >= offset && arg.startsWith(prefix))
if (url) {

2
src/renderer/src/components/tools/StoreCard.tsx
View File

@@ -235,7 +235,7 @@ const StoreCard = ({
if (!checkDesktop()) {
void message.loading({ content: '启动桌面端中……', key: 'LOADING', duration: 0 })
protocolCheck(
`oxygen://openurl/view/${author.username}/${toolId}`,
`${import.meta.env.VITE_DESKTOP_PROTOCOL}://openurl/view/${author.username}/${toolId}`,
() => {
void message.warning('打开失败,此应用需要桌面端环境,请安装桌面端后重试')
void message.destroy('LOADING')

3
src/renderer/src/global.d.ts vendored
View File

@@ -6,7 +6,8 @@ type Platform = 'WEB' | 'DESKTOP' | 'ANDROID'
interface ImportMetaEnv {
readonly VITE_PLATFORM: Platform
readonly VITE_PROTOCOL: string
readonly VITE_DESKTOP_PROTOCOL: string
readonly VITE_APP_PROTOCOL: string
readonly VITE_UI_URL: string
readonly VITE_API_URL: string
readonly VITE_API_TOKEN_URL: string

2
src/renderer/src/util/navigation.ts
View File

@@ -153,4 +153,4 @@ export const getViewPath = (
}
export const getAndroidUrl = (username: string, toolId: string) =>
`oxygen://opentool/${username}/${toolId}`
`${import.meta.env.VITE_APP_PROTOCOL}://opentool/${username}/${toolId}`