octo/tooot
1
0
Fork 0
mirror of https://github.com/tooot-app/app synced 2025-06-05 22:19:13 +02:00
Code Issues Projects Releases Wiki Activity

Use in-memory global values

Browse Source 
As connect needs to be read very often
This commit is contained in:
xmflsct
2023-01-29 19:02:47 +01:00
parent ebe57be674
commit 5c3e490112
5 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/utils/api/general.ts
View File

@ -1,5 +1,5 @@
import { getGlobalStorage } from '@utils/storage/actions'
import axios from 'axios'
import { GLOBAL } from '../../App'
import { ctx, handleError, PagedResponse, parseHeaderLinks, userAgent } from './helpers'
import { CONNECT_DOMAIN } from './helpers/connect'
@ -34,12 +34,10 @@ const apiGeneral = async <T = unknown>({
params ? params : ''
)
const useConnect = getGlobalStorage.boolean('app.connect')
return axios({
timeout: method === 'post' ? 1000 * 60 : 1000 * 15,
method,
baseURL: `https://${useConnect ? CONNECT_DOMAIN() : domain}`,
baseURL: `https://${GLOBAL.connect ? CONNECT_DOMAIN() : domain}`,
url,
params,
headers: {
@ -47,7 +45,7 @@ const apiGeneral = async <T = unknown>({
...userAgent,
...headers,
...(body && body instanceof FormData && { 'Content-Type': 'multipart/form-data' }),
...(useConnect && { 'x-tooot-domain': domain })
...(GLOBAL.connect && { 'x-tooot-domain': domain })
},
data: body
})

7
src/utils/api/helpers/connect.ts
View File

@ -1,8 +1,9 @@
import { mapEnvironment } from '@utils/helpers/checkEnvironment'
import { getGlobalStorage, setGlobalStorage } from '@utils/storage/actions'
import { setGlobalStorage } from '@utils/storage/actions'
import axios from 'axios'
import parse from 'url-parse'
import { userAgent } from '.'
import { GLOBAL } from '../../../App'
const list = [
'n61owz4leck',
@ -119,8 +120,7 @@ export const connectImage = ({
}: {
uri?: string
}): { uri?: string; headers?: { 'x-tooot-domain': string } } => {
const connect = getGlobalStorage.boolean('app.connect')
if (connect) {
if (GLOBAL.connect) {
if (uri) {
const host = parse(uri).host
return { uri: uri.replace(host, CONNECT_DOMAIN()), headers: { 'x-tooot-domain': host } }
@ -139,6 +139,7 @@ export const connectVerify = () =>
url: 'verify',
headers: { ...userAgent }
}).catch(err => {
GLOBAL.connect = false
setGlobalStorage('app.connect', false)
return Promise.reject(err)
})

9
src/utils/api/instance.ts
View File

@ -1,6 +1,7 @@
import { getAccountDetails, getGlobalStorage } from '@utils/storage/actions'
import { getAccountDetails } from '@utils/storage/actions'
import { StorageGlobal } from '@utils/storage/global'
import axios, { AxiosRequestConfig } from 'axios'
import { GLOBAL } from '../../App'
import { ctx, handleError, PagedResponse, parseHeaderLinks, userAgent } from './helpers'
import { CONNECT_DOMAIN } from './helpers/connect'
@ -45,13 +46,11 @@ const apiInstance = async <T = unknown>({
params ? params : ''
)
const useConnect = getGlobalStorage.boolean('app.connect')
return axios({
timeout: method === 'post' ? 1000 * 60 : 1000 * 15,
method,
baseURL: `https://${
useConnect ? CONNECT_DOMAIN() : accountDetails['auth.domain']
GLOBAL.connect ? CONNECT_DOMAIN() : accountDetails['auth.domain']
}/api/${version}`,
url,
params,
@ -61,7 +60,7 @@ const apiInstance = async <T = unknown>({
...headers,
Authorization: `Bearer ${accountDetails['auth.token']}`,
...(body && body instanceof FormData && { 'Content-Type': 'multipart/form-data' }),
...(useConnect && { 'x-tooot-domain': accountDetails['auth.domain'] })
...(GLOBAL.connect && { 'x-tooot-domain': accountDetails['auth.domain'] })
},
data: body,
...extras