fixup: use structuredClone

The method has to be lowercase because it is used as an index to get
the respective method of the router.

packages/backend/src/server/api/api-handler.ts

@@ -5,12 +5,23 @@ import authenticate, { AuthenticationError } from './authenticate.js';
 import call from './call.js';
 import { ApiError } from './error.js';
 
+function getRequestArguments(ctx: Koa.Context): Record<string, any> {
+	const args = {
+		...(ctx.params || {}),
+		...ctx.query,
+		...(ctx.request.body || {}),
+	};
+
+	// For security reasons, we drop the i parameter if it's a GET request
+	if (ctx.method === 'GET') {
+		delete args['i'];
+	}
+
+	return args;
+}
+
 export async function handler(endpoint: IEndpoint, ctx: Koa.Context): Promise<void> {
-	const body = ctx.is('multipart/form-data')
+	const body = getRequestArguments(ctx);
-		? (ctx.request as any).body
-		: ctx.method === 'GET'
-			? ctx.query
-			: ctx.request.body;
 
 	const error = (e: ApiError): void => {
 		ctx.status = e.httpStatusCode;

packages/backend/src/server/api/endpoints.ts

@@ -702,6 +702,24 @@ export interface IEndpointMeta {
 	 * 正常応答をキャッシュ (Cache-Control: public) する秒数
 	 */
 	readonly cacheSec?: number;
+
+	/**
+	 * API v2 options
+	 */
+	readonly v2?: {
+
+		/**
+		 * HTTP verb this endpoint supports
+		 */
+		readonly method: 'get' | 'put' | 'post' | 'patch' | 'delete';
+
+		/**
+		 * Path alias for v2 endpoint
+		 * 
+		 * @example (v0) /api/notes/create -> /api/v2/notes
+		 */
+		readonly alias?: string;
+	};
 }
 
 export interface IEndpoint {

packages/backend/src/server/api/endpoints/meta.ts

@@ -233,6 +233,10 @@ export const meta = {
 			},
 		},
 	},
+
+	v2: {
+		method: 'get'
+	},
 } as const;
 
 export const paramDef = {

packages/backend/src/server/api/endpoints/notes/children.ts

@@ -21,6 +21,11 @@ export const meta = {
 			ref: 'Note',
 		},
 	},
+
+	v2: {
+		method: 'get',
+		alias: 'notes/:noteId/children',
+	},
 } as const;
 
 export const paramDef = {

packages/backend/src/server/api/endpoints/notes/clips.ts

@@ -19,6 +19,11 @@ export const meta = {
 		},
 	},
 
+	v2: {
+		method: 'get',
+		alias: 'notes/:noteId/clips',
+	},
+
 	errors: ['NO_SUCH_NOTE'],
 } as const;
 

packages/backend/src/server/api/endpoints/notes/conversation.ts

@@ -19,6 +19,11 @@ export const meta = {
 		},
 	},
 
+	v2: {
+		method: 'get',
+		alias: 'notes/:noteId/conversation',
+	},
+
 	errors: ['NO_SUCH_NOTE'],
 } as const;
 

packages/backend/src/server/api/endpoints/notes/create.ts

@@ -37,6 +37,11 @@ export const meta = {
 		},
 	},
 
+	v2: {
+		method: 'post',
+		alias: 'notes',
+	},
+
 	errors: ['NO_SUCH_NOTE', 'PURE_RENOTE', 'EXPIRED_POLL', 'NO_SUCH_CHANNEL', 'BLOCKED', 'LESS_RESTRICTIVE_VISIBILITY'],
 } as const;
 

packages/backend/src/server/api/endpoints/notes/delete.ts

@@ -18,6 +18,11 @@ export const meta = {
 		minInterval: SECOND,
 	},
 
+	v2: {
+		method: 'delete',
+		alias: 'notes/:noteId',
+	},
+
 	errors: ['ACCESS_DENIED', 'NO_SUCH_NOTE'],
 } as const;
 

packages/backend/src/server/api/endpoints/notes/featured.ts

@@ -18,6 +18,10 @@ export const meta = {
 			ref: 'Note',
 		},
 	},
+
+	v2: {
+		method: 'get',
+	}
 } as const;
 
 export const paramDef = {

packages/backend/src/server/api/endpoints/notes/reactions.ts

@@ -23,6 +23,11 @@ export const meta = {
 		},
 	},
 
+	v2: {
+		method: 'get',
+		alias: 'notes/:noteId/reactions/:type?',
+	},
+
 	errors: ['NO_SUCH_NOTE'],
 } as const;
 

packages/backend/src/server/api/endpoints/notes/renotes.ts

@@ -22,6 +22,11 @@ export const meta = {
 		},
 	},
 
+	v2: {
+		method: 'get',
+		alias: 'notes/:noteId/renotes',
+	},
+
 	errors: ['NO_SUCH_NOTE'],
 } as const;
 

packages/backend/src/server/api/endpoints/notes/replies.ts

@@ -21,6 +21,11 @@ export const meta = {
 		},
 	},
 
+	v2: {
+		method: 'get',
+		alias: 'notes/:noteId/replies',
+	},
+
 	errors: ['NO_SUCH_NOTE'],
 } as const;
 

packages/backend/src/server/api/endpoints/notes/show.ts

@@ -14,6 +14,11 @@ export const meta = {
 		ref: 'Note',
 	},
 
+	v2: {
+		method: 'get',
+		alias: 'notes/:noteId',
+	},
+
 	errors: ['NO_SUCH_NOTE'],
 } as const;
 

packages/backend/src/server/api/endpoints/notes/state.ts

@@ -27,6 +27,11 @@ export const meta = {
 		},
 	},
 
+	v2: {
+		method: 'get',
+		alias: 'notes/:noteId/status',
+	},
+
 	errors: ['NO_SUCH_NOTE'],
 } as const;
 

packages/backend/src/server/api/endpoints/notes/translate.ts

@@ -56,6 +56,11 @@ export const meta = {
 		},
 	},
 
+	v2: {
+		method: 'get',
+		alias: 'notes/:noteId/translate/:targetLang/:sourceLang?',
+	},
+
 	errors: ['NO_SUCH_NOTE'],
 } as const;
 

packages/backend/src/server/api/endpoints/notes/unrenote.ts

@@ -18,6 +18,11 @@ export const meta = {
 		minInterval: SECOND,
 	},
 
+	v2: {
+		method: 'delete',
+		alias: 'notes/:noteId/renotes',
+	},
+
 	errors: ['NO_SUCH_NOTE'],
 } as const;
 

packages/backend/src/server/api/index.ts

@@ -69,6 +69,11 @@ for (const endpoint of endpoints) {
 		} else {
 			router.get(`/${endpoint.name}`, async ctx => { ctx.status = 405; });
 		}
+
+		if (endpoint.meta.v2) {
+			const path = endpoint.meta.v2.alias ?? endpoint.name.replace(/-/g, '_');
+			router[endpoint.meta.v2.method](`/v2/${path}`, handler.bind(null, endpoint));
+		}
 	}
 }
 

packages/backend/src/server/api/openapi/gen-spec.ts

@@ -207,6 +207,19 @@ export function genOpenapiSpec() {
 		}
 
 		spec.paths['/' + endpoint.name] = path;
+
+		if (endpoint.meta.v2) {
+			// we need a clone of the API endpoint info because otherwise we change it by reference
+			const infoClone = structuredClone(info);
+			const route = `/v2/${endpoint.meta.v2.alias ?? endpoint.name.replace(/-/g, '_')}`;
+
+			infoClone['operationId'] = infoClone['summary'] = route;
+
+			spec.paths[route] = {
+				...spec.paths[route],
+				[endpoint.meta.v2.method]: infoClone,
+			};
+		}
 	}
 
 	return spec;