kglt/fyne-on
1
0
Fork 0
Code Pull requests Activity Actions

feat: adopt to /api/v2/instance to fetch app vapid_key (#3193)

Browse source
This commit is contained in:
TAKAHASHI Shuuji 2025-03-02 19:56:27 +09:00 • committed by GitHub
parent 74b7c9da2c
commit 7d9712c209
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 38 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/cache-driver.ts
View file

@ -16,10 +16,10 @@ export default defineDriver((driver: Driver = memory()) => {
return driver.hasItem(key, {}) return driver.hasItem(key, {})
}, },
async setItem(key: string, value: any) { async setItem(key: string, value: any, opts: any = {}) {
await Promise.all([ await Promise.all([
memoryDriver.setItem?.(key, value, {}), memoryDriver.setItem?.(key, value, {}),
driver.setItem?.(key, value, {}), driver.setItem?.(key, value, opts),
]) ])
}, },
async getItem(key: string) { async getItem(key: string) {

52
server/utils/shared.ts
View file

@ -52,30 +52,50 @@ export function getRedirectURI(origin: string, server: string) {
export const defaultUserAgent = `${APP_NAME}/${version}` export const defaultUserAgent = `${APP_NAME}/${version}`
async function fetchAppInfo(origin: string, server: string) { async function fetchAppInfo(origin: string, server: string) {
const app: AppInfo = await $fetch(`https://${server}/api/v1/apps`, { const [apps, v2Instance] = await Promise.all([
method: 'POST', $fetch(`https://${server}/api/v1/apps`, {
headers: { method: 'POST',
'user-agent': defaultUserAgent, headers: {
}, 'user-agent': defaultUserAgent,
body: { },
client_name: APP_NAME + (env !== 'release' ? ` (${env})` : ''), body: {
website: 'https://elk.zone', client_name: APP_NAME + (env !== 'release' ? ` (${env})` : ''),
redirect_uris: getRedirectURI(origin, server), website: 'https://elk.zone',
scopes: 'read write follow push', redirect_uris: getRedirectURI(origin, server),
}, scopes: 'read write follow push',
}) },
}),
$fetch(`https://${server}/api/v2/instance`, {
headers: {
'user-agent': defaultUserAgent,
},
})
.catch(() => null),
])
const app: AppInfo = {
...apps,
// prefer vapid key from `/api/v2/instance` if available
// since `vapid_key` from `/api/v1/apps` was deprecated on Mastodon v4.3.0+
// ref. apps API methods - Mastodon documentation
// - https://docs.joinmastodon.org/methods/apps/#create
...v2Instance ? { vapid_key: v2Instance.configuration.vapid.public_key } : {},
}
return app return app
} }
export async function getApp(origin: string, server: string) { export async function getApp(origin: string, server: string) {
const host = origin.replace(/^https?:\/\//, '').replace(/\W/g, '-').replace(/\?.*$/, '') const host = origin.replace(/^https?:\/\//, '').replace(/\W/g, '-').replace(/\?.*$/, '')
const key = `servers:v3:${server}:${host}.json`.toLowerCase() const key = `servers:v4:${server}:${host}.json`.toLowerCase()
try { try {
if (await storage.hasItem(key)) if (await storage.hasItem(key))
return (storage.getItem(key, {}) as Promise<AppInfo>) return (storage.getItem(key, {}) as Promise<AppInfo>)
const appInfo = await fetchAppInfo(origin, server) const appInfo = await fetchAppInfo(origin, server)
await storage.setItem(key, appInfo) // cache `appInfo` for 1 week to prevent permanent lockout
// note that `unstorage` supports `ttl` only for some storage drivers like cloudflare
await storage.setItem(key, appInfo, { ttl: 60 * 60 * 24 * 7 /* 1 week */ })
return appInfo return appInfo
} }
catch { catch {
@ -84,13 +104,13 @@ export async function getApp(origin: string, server: string) {
} }
export async function deleteApp(server: string) { export async function deleteApp(server: string) {
const keys = (await storage.getKeys(`servers:v3:${server}:`)) const keys = (await storage.getKeys(`servers:v4:${server}:`))
for (const key of keys) for (const key of keys)
await storage.removeItem(key) await storage.removeItem(key)
} }
export async function listServers() { export async function listServers() {
const keys = await storage.getKeys('servers:v3:') const keys = await storage.getKeys('servers:v4:')
const servers = new Set<string>() const servers = new Set<string>()
for (const key of keys) { for (const key of keys) {
const id = key.split(':')[2] const id = key.split(':')[2]