smallfix

Author: totegamma

src/app.ts

@@ -26,12 +26,6 @@ const receiveAuthInfo = (c: HonoContext): AuthInfo | null => {
 
 
 const app = new Hono();
-app.use(federation(fedi, () => undefined));
-app.use(cors({
-    origin: "*",
-    allowMethods: ["GET", "POST", "PUT", "DELETE", "OPTIONS"],
-    allowHeaders: ["Content-Type", "Authorization"],
-}));
 
 interface ApServerInfo {
     serviceAccountId: string
@@ -54,11 +48,24 @@ const ccEndpoints: Record<string, string> = {
     "net.concrnt.activitypub.resolve":   "/ap/api/resolve?uri={uri}",
 };
 
+// 以下2つは定期ポーリングされるため、fedifyミドルウェアより前に登録して
+// fedify·federation·http のアクセスログ(毎リクエストINFO)に乗せない。
+
 // concrnt本体が services 登録済みサービスへ直接ポーリングするサービス広告
 app.get("/cc-info", (c) =>
     c.json({ name: pkg.name, version: pkg.version, endpoints: ccEndpoints })
 );
 
+// livenessProbe用ヘルスチェック
+app.get("/health", (c) => c.json({ status: "ok" }));
+
+app.use(federation(fedi, () => undefined));
+app.use(cors({
+    origin: "*",
+    allowMethods: ["GET", "POST", "PUT", "DELETE", "OPTIONS"],
+    allowHeaders: ["Content-Type", "Authorization"],
+}));
+
 app.get("/ap", (c) => c.text("Hello, Fedify!"));
 
 app.get("/ap/api/info", async (c) => {
@@ -71,17 +78,6 @@ app.get("/ap/api/info", async (c) => {
 });
 
 
-
-app.get("/ap/test", async (c) => {
-
-    const authInfo = receiveAuthInfo(c);
-
-    return c.json({ 
-        message: "Hello from the API!",
-        authInfo,
-    });
-});
-
 app.post("/ap/api/setup", async (c) => {
 
     const authInfo = receiveAuthInfo(c)