@cartanova/qgrid-cli 1.7.0 → 1.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +67 -2
- package/bundle/dist/application/qgrid/oauth.js +5 -6
- package/bundle/dist/application/qgrid/qgrid.dispatcher.js +47 -32
- package/bundle/dist/application/qgrid/qgrid.frame.js +13 -25
- package/bundle/dist/application/qgrid/qgrid.types.js +10 -3
- package/bundle/dist/application/qgrid/token-subscriber.js +149 -0
- package/bundle/dist/application/qgrid/token-trigger-setup.js +69 -0
- package/bundle/dist/application/sonamu.generated.sso.js +1 -1
- package/bundle/dist/application/token/token.types.js +1 -1
- package/bundle/dist/i18n/sd.generated.js +2 -2
- package/bundle/dist/migrations/20260410171405_create__request_logs.js +1 -1
- package/bundle/dist/migrations/20260410171406_create__tokens.js +1 -1
- package/bundle/dist/migrations/20260411120624_alter_tokens_alter2.js +1 -1
- package/bundle/dist/migrations/20260415134649_alter_request_logs_alter1.js +1 -1
- package/bundle/dist/migrations/20260421223627_alter_request_logs_add1_alter1.js +1 -1
- package/bundle/dist/migrations/20260423180818_alter_request_logs_add1_alter1.js +1 -1
- package/bundle/dist/migrations/20260423182017_alter_request_logs_add2_drop1_alter1.js +1 -1
- package/bundle/dist/migrations/20260423183613_alter_request_logs_add1_alter1.js +1 -1
- package/bundle/dist/sonamu.config.js +41 -46
- package/bundle/dist/testing/setup-mocks.js +1 -1
- package/bundle/dist/utils/subset-loaders.js +1 -1
- package/bundle/src/application/qgrid/oauth.ts +5 -2
- package/bundle/src/application/qgrid/qgrid.dispatcher.ts +72 -32
- package/bundle/src/application/qgrid/qgrid.frame.ts +14 -28
- package/bundle/src/application/qgrid/qgrid.types.ts +9 -0
- package/bundle/src/application/qgrid/token-subscriber.ts +176 -0
- package/bundle/src/application/qgrid/token-trigger-setup.ts +80 -0
- package/bundle/src/application/request-log/request-log.entity.json +3 -1
- package/bundle/src/application/sonamu.generated.sso.ts +5 -5
- package/bundle/src/application/token/token.types.ts +1 -1
- package/bundle/src/i18n/sd.generated.ts +1 -1
- package/bundle/src/migrations/20260410171405_create__request_logs.ts +1 -1
- package/bundle/src/migrations/20260410171406_create__tokens.ts +1 -1
- package/bundle/src/migrations/20260411120624_alter_tokens_alter2.ts +1 -1
- package/bundle/src/migrations/20260415134649_alter_request_logs_alter1.ts +1 -1
- package/bundle/src/migrations/20260421223627_alter_request_logs_add1_alter1.ts +1 -1
- package/bundle/src/migrations/20260423180818_alter_request_logs_add1_alter1.ts +1 -1
- package/bundle/src/migrations/20260423182017_alter_request_logs_add2_drop1_alter1.ts +1 -1
- package/bundle/src/migrations/20260423183613_alter_request_logs_add1_alter1.ts +1 -1
- package/bundle/src/sonamu.config.ts +40 -50
- package/bundle/src/testing/setup-mocks.ts +1 -1
- package/bundle/src/typings/fastify.d.ts +1 -1
- package/bundle/src/typings/sonamu.d.ts +3 -2
- package/bundle/src/utils/subset-loaders.ts +1 -1
- package/bundle/web-dist/client/assets/{index-DUmwX7rR.js → index-DzEE3oyG.js} +3 -3
- package/bundle/web-dist/client/assets/{logs-ci_3vzTT.js → logs-Bn56eAAL.js} +1 -1
- package/bundle/web-dist/client/assets/{routes-Ch5LFN0K.js → routes-BCEPwpzm.js} +1 -1
- package/bundle/web-dist/client/assets/{sd.generated-CIOZewtL.js → sd.generated-C9WnMJm4.js} +1 -1
- package/bundle/web-dist/client/assets/{services.generated-BrB-RELO.js → services.generated-CWN1-bYW.js} +1 -1
- package/bundle/web-dist/client/assets/{show-D3N15Krg.js → show-Ch7LEdBK.js} +1 -1
- package/bundle/web-dist/client/assets/tokens-DPvuQIs2.js +1 -0
- package/bundle/web-dist/client/index.html +2 -2
- package/bundle/web-dist/server/assets/{copy-CKCGxwII.js → copy-SIUvcEcZ.js} +1 -1
- package/bundle/web-dist/server/assets/{lazyRouteComponent-BlvOfJIF.js → lazyRouteComponent-CcyhCAoL.js} +2 -2
- package/bundle/web-dist/server/assets/{logs-CDacVwTQ.js → logs-D1ezT2IS.js} +3 -3
- package/bundle/web-dist/server/assets/{routes-BLm-zF86.js → routes-CtTFrsIz.js} +2 -2
- package/bundle/web-dist/server/assets/{sd.generated-CIg_jf8e.js → sd.generated-CkiEsOwK.js} +1 -1
- package/bundle/web-dist/server/assets/{services.generated-wCfUuY7Z.js → services.generated-D4asAlWb.js} +1 -1
- package/bundle/web-dist/server/assets/{shim-Dq_Izqnc.js → shim-BYpcQGN1.js} +1 -1
- package/bundle/web-dist/server/assets/{show-DjJyZunM.js → show-Bz0If-L7.js} +4 -4
- package/bundle/web-dist/server/assets/{tokens-rQIIgqMo.js → tokens-BBBfLC7N.js} +11 -4
- package/bundle/web-dist/server/entry-server.generated.js +7 -7
- package/package.json +1 -1
- package/bundle/web-dist/client/assets/tokens-BAlIaa6X.js +0 -1
|
@@ -1,24 +1,27 @@
|
|
|
1
1
|
import "./_virtual/_rolldown/runtime.js";
|
|
2
|
+
import { getConsoleSink } from "@logtape/logtape";
|
|
2
3
|
import { CachePresets, defineConfig } from "sonamu";
|
|
3
4
|
import path from "path";
|
|
4
|
-
import { getConsoleSink } from "@logtape/logtape";
|
|
5
5
|
import { getPrettyFormatter } from "@logtape/pretty";
|
|
6
6
|
import dotenv from "dotenv";
|
|
7
7
|
import { drivers, store } from "sonamu/cache";
|
|
8
|
-
import { drivers as drivers$1 } from "sonamu/storage";
|
|
9
8
|
//#region src/sonamu.config.ts
|
|
10
9
|
dotenv.config({ path: path.join(import.meta.dirname, "../.env") });
|
|
11
10
|
const host = process.env.HOST ?? "localhost";
|
|
12
11
|
const port = Number(process.env.PORT ?? 44900);
|
|
12
|
+
const connConfig = {
|
|
13
|
+
host: process.env.QGRID_DB_HOST ?? "localhost",
|
|
14
|
+
port: Number(process.env.QGRID_DB_PORT ?? 44901),
|
|
15
|
+
user: process.env.QGRID_DB_USER ?? "postgres",
|
|
16
|
+
password: process.env.QGRID_DB_PASSWORD ?? "postgres",
|
|
17
|
+
database: process.env.QGRID_DB_NAME ?? "qgrid"
|
|
18
|
+
};
|
|
13
19
|
var sonamu_config_default = defineConfig({
|
|
14
20
|
projectName: process.env.PROJECT_NAME ?? "SonamuProject",
|
|
15
21
|
database: {
|
|
16
22
|
name: process.env.QGRID_DB_NAME ?? "qgrid",
|
|
17
23
|
defaultOptions: { connection: {
|
|
18
|
-
|
|
19
|
-
port: Number(process.env.QGRID_DB_PORT ?? 44901),
|
|
20
|
-
user: process.env.QGRID_DB_USER ?? "postgres",
|
|
21
|
-
password: process.env.QGRID_DB_PASSWORD ?? "postgres",
|
|
24
|
+
...connConfig,
|
|
22
25
|
keepAlive: true,
|
|
23
26
|
keepAliveInitialDelayMillis: 1e4
|
|
24
27
|
} },
|
|
@@ -65,11 +68,23 @@ var sonamu_config_default = defineConfig({
|
|
|
65
68
|
categoryWidth: 20,
|
|
66
69
|
categoryTruncate: "middle"
|
|
67
70
|
}) }) },
|
|
68
|
-
loggers: [
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
71
|
+
loggers: [
|
|
72
|
+
{
|
|
73
|
+
category: ["qgrid"],
|
|
74
|
+
sinks: ["console"],
|
|
75
|
+
lowestLevel: "info"
|
|
76
|
+
},
|
|
77
|
+
{
|
|
78
|
+
category: ["sonamu"],
|
|
79
|
+
sinks: ["console"],
|
|
80
|
+
lowestLevel: "warning"
|
|
81
|
+
},
|
|
82
|
+
{
|
|
83
|
+
category: ["fastify"],
|
|
84
|
+
sinks: [],
|
|
85
|
+
lowestLevel: "fatal"
|
|
86
|
+
}
|
|
87
|
+
]
|
|
73
88
|
},
|
|
74
89
|
server: {
|
|
75
90
|
listen: {
|
|
@@ -105,10 +120,7 @@ var sonamu_config_default = defineConfig({
|
|
|
105
120
|
body: request.body
|
|
106
121
|
};
|
|
107
122
|
},
|
|
108
|
-
guardHandler: (
|
|
109
|
-
if (_guard === "user") console.log("user guard");
|
|
110
|
-
console.log("NOTHING YET");
|
|
111
|
-
},
|
|
123
|
+
guardHandler: () => {},
|
|
112
124
|
cacheControlHandler: (req) => {
|
|
113
125
|
switch (req.type) {
|
|
114
126
|
case "assets":
|
|
@@ -125,29 +137,6 @@ var sonamu_config_default = defineConfig({
|
|
|
125
137
|
}
|
|
126
138
|
}
|
|
127
139
|
},
|
|
128
|
-
storage: { drivers: {
|
|
129
|
-
fs: drivers$1.fs({
|
|
130
|
-
location: path.join(import.meta.dirname, "/../public/uploaded"),
|
|
131
|
-
visibility: "public",
|
|
132
|
-
urlBuilder: {
|
|
133
|
-
async generateURL(key) {
|
|
134
|
-
return `/api/public/uploaded/${key}`;
|
|
135
|
-
},
|
|
136
|
-
async generateSignedURL(key) {
|
|
137
|
-
return `/api/public/uploaded/${key}`;
|
|
138
|
-
}
|
|
139
|
-
}
|
|
140
|
-
}),
|
|
141
|
-
s3: drivers$1.s3({
|
|
142
|
-
credentials: {
|
|
143
|
-
accessKeyId: process.env.AWS_ACCESS_KEY_ID ?? "",
|
|
144
|
-
secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY ?? ""
|
|
145
|
-
},
|
|
146
|
-
region: process.env.S3_REGION ?? "ap-northeast-2",
|
|
147
|
-
bucket: process.env.S3_BUCKET ?? "sonamu_default_bucket",
|
|
148
|
-
visibility: "private"
|
|
149
|
-
})
|
|
150
|
-
} },
|
|
151
140
|
cache: {
|
|
152
141
|
default: "main",
|
|
153
142
|
stores: { main: store().useL1Layer(drivers.memory({ maxSize: "50mb" })) },
|
|
@@ -169,17 +158,23 @@ var sonamu_config_default = defineConfig({
|
|
|
169
158
|
console.warn(`⚠ Migration skipped: ${e.message}`);
|
|
170
159
|
}
|
|
171
160
|
const { QgridDispatcher } = await import("./application/qgrid/qgrid.dispatcher.js");
|
|
161
|
+
const { ensureTokensTrigger } = await import("./application/qgrid/token-trigger-setup.js");
|
|
162
|
+
const { TokenSubscriber } = await import("./application/qgrid/token-subscriber.js");
|
|
163
|
+
let triggerReady = true;
|
|
172
164
|
try {
|
|
173
|
-
|
|
174
|
-
const entries = await TokenModel.findActive("A");
|
|
175
|
-
for (const e of entries) QgridDispatcher.addToken(e.token, e.name);
|
|
176
|
-
console.log(`🌲 Server listening on http://${host}:${port} (${QgridDispatcher.tokens.size} tokens loaded)`);
|
|
165
|
+
await ensureTokensTrigger(connConfig);
|
|
177
166
|
} catch (e) {
|
|
178
|
-
|
|
179
|
-
console.
|
|
167
|
+
triggerReady = false;
|
|
168
|
+
console.warn(`⚠ Token trigger setup failed: ${e.message}. Continuing with LISTEN/reconcile.`);
|
|
180
169
|
}
|
|
170
|
+
const subscriber = new TokenSubscriber(connConfig, QgridDispatcher);
|
|
171
|
+
QgridDispatcher.subscriber = subscriber;
|
|
172
|
+
const tokenInfo = await subscriber.start() ? `${QgridDispatcher.tokens.size} active tokens, LISTEN active` : `degraded — token sync retry scheduled`;
|
|
173
|
+
console.log(`🌲 Server listening on http://${host}:${port} (${tokenInfo}${triggerReady ? "" : ", trigger setup failed"})`);
|
|
181
174
|
},
|
|
182
|
-
onShutdown: () => {
|
|
175
|
+
onShutdown: async () => {
|
|
176
|
+
const { QgridDispatcher } = await import("./application/qgrid/qgrid.dispatcher.js");
|
|
177
|
+
if (QgridDispatcher.subscriber) await QgridDispatcher.subscriber.stop();
|
|
183
178
|
console.log("graceful shutdown");
|
|
184
179
|
},
|
|
185
180
|
onError: (error, _request, reply) => {
|
|
@@ -195,4 +190,4 @@ var sonamu_config_default = defineConfig({
|
|
|
195
190
|
//#endregion
|
|
196
191
|
export { sonamu_config_default as default };
|
|
197
192
|
|
|
198
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"sonamu.config.js","names":["drivers","cacheDrivers"],"sources":["../src/sonamu.config.ts"],"sourcesContent":["import path from \"path\";\n\nimport { getConsoleSink } from \"@logtape/logtape\";\nimport { getPrettyFormatter } from \"@logtape/pretty\";\nimport dotenv from \"dotenv\";\nimport { CachePresets, defineConfig } from \"sonamu\";\nimport { drivers as cacheDrivers, store } from \"sonamu/cache\";\nimport { drivers } from \"sonamu/storage\";\n\ndotenv.config({ path: path.join(import.meta.dirname, \"../.env\") });\n\nconst host = process.env.HOST ?? \"localhost\";\nconst port = Number(process.env.PORT ?? 44900);\n\nexport default defineConfig({\n  projectName: process.env.PROJECT_NAME ?? \"SonamuProject\",\n  database: {\n    name: process.env.QGRID_DB_NAME ?? \"qgrid\",\n    defaultOptions: {\n      connection: {\n        host: process.env.QGRID_DB_HOST ?? \"localhost\",\n        port: Number(process.env.QGRID_DB_PORT ?? 44901),\n        user: process.env.QGRID_DB_USER ?? \"postgres\",\n        password: process.env.QGRID_DB_PASSWORD ?? \"postgres\",\n        keepAlive: true,\n        keepAliveInitialDelayMillis: 10000,\n      },\n    },\n    environments: {\n      fixture: {\n        connection: {\n          host: process.env.DEV0_DB_HOST,\n          port: Number(process.env.DEV0_DB_PORT),\n          database: process.env.QGRID_DB_NAME + \"_fixture\",\n          user: process.env.DEV0_DB_USER,\n          password: process.env.DEV0_DB_PASSWORD,\n        },\n      },\n      test: {\n        connection: {\n          host: \"0.0.0.0\",\n          port: 54321,\n          database: \"qgrid_test\",\n          user: \"postgres\",\n          password: \"postgres\",\n        },\n      },\n    },\n  },\n  api: {\n    dir: \"api\",\n    timezone: \"Asia/Seoul\",\n    route: {\n      prefix: \"/api\",\n    },\n  },\n  i18n: {\n    defaultLocale: \"ko\",\n    supportedLocales: [\"ko\", \"en\"],\n  },\n  sync: {\n    targets: [\"web\"],\n  },\n  slackConfirm:\n    process.env.SLACK_BOT_TOKEN && process.env.SLACK_CHANNEL_ID\n      ? {\n          targets: [\"development_master\", \"production_master\"],\n          botToken: process.env.SLACK_BOT_TOKEN ?? \"\",\n          channelId: process.env.SLACK_CHANNEL_ID ?? \"\",\n        }\n      : undefined,\n  test: {\n    parallel: true,\n    maxWorkers: 4,\n    devRunner: { enabled: true },\n  },\n  logging: {\n    sinks: {\n      console: getConsoleSink({\n        formatter: getPrettyFormatter({\n          timestamp: \"time\",\n          categoryWidth: 20,\n          categoryTruncate: \"middle\",\n        }),\n      }),\n    },\n    loggers: [\n      {\n        category: [\"sonamu\"],\n        sinks: [\"console\"],\n        lowestLevel: process.env.NODE_ENV === \"test\" ? \"warning\" : \"debug\",\n      },\n    ],\n  },\n  server: {\n    listen: { port, host },\n    plugins: {\n      formbody: true,\n      qs: true,\n      multipart: { limits: { fileSize: 1024 * 1024 * 30 } },\n      static: {\n        root: path.join(import.meta.dirname, \"/../\", \"public\"),\n        prefix: \"/api/public\",\n      },\n      custom: (server) => {\n        // OAuth 콜백 — Anthropic이 /callback으로 리다이렉트\n        server.get(\"/callback\", async (request, reply) => {\n          const { code, state } = request.query as { code?: string; state?: string };\n          if (!code || !state) {\n            return reply.redirect(\"/?oauth=error&reason=missing_params\");\n          }\n          // Frame의 oauthCallback으로 위임\n          try {\n            const { QgridFrame } = await import(\"./application/qgrid/qgrid.frame\");\n            await QgridFrame.handleOAuthCallback(code, state, reply);\n          } catch (e) {\n            return reply.redirect(\n              `/?oauth=error&reason=${encodeURIComponent((e as Error).message)}`,\n            );\n          }\n        });\n      },\n    },\n    apiConfig: {\n      contextProvider: (defaultContext, request) => {\n        return {\n          ...defaultContext,\n          ip: request.ip,\n          body: request.body,\n        };\n      },\n      guardHandler: (_guard, _request, _api) => {\n        if (_guard === \"user\") {\n          console.log(\"user guard\");\n        }\n        console.log(\"NOTHING YET\");\n      },\n      cacheControlHandler: (req) => {\n        switch (req.type) {\n          case \"assets\":\n            // Hash 포함된 파일: 영구 캐시\n            if (req.path.match(/-[a-f0-9]+\\./)) {\n              return CachePresets.immutable;\n            }\n            return CachePresets.longLived;\n\n          case \"api\":\n            // GET 요청만 캐싱 고려\n            if (req.method === \"GET\") {\n              // 특정 경로는 짧은 캐시\n              if (req.path.startsWith(\"/api/static-data\")) {\n                return CachePresets.shortLived;\n              }\n              if (req.path.startsWith(\"/api/terms\")) {\n                return CachePresets.mediumLived;\n              }\n            }\n            // 기본: 캐시 없음\n            return CachePresets.noCache;\n\n          case \"ssr\":\n            // SSR 페이지: 10초 캐시\n            return CachePresets.ssr;\n\n          case \"csr\":\n            // CSR fallback (index.html): 1분 캐시\n            return CachePresets.shortLived;\n        }\n      },\n    },\n    storage: {\n      drivers: {\n        fs: drivers.fs({\n          location: path.join(import.meta.dirname, \"/../public/uploaded\"),\n          visibility: \"public\",\n          urlBuilder: {\n            async generateURL(key) {\n              return `/api/public/uploaded/${key}`;\n            },\n            async generateSignedURL(key) {\n              return `/api/public/uploaded/${key}`;\n            },\n          },\n        }),\n        s3: drivers.s3({\n          credentials: {\n            accessKeyId: process.env.AWS_ACCESS_KEY_ID ?? \"\",\n            secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY ?? \"\",\n          },\n          region: process.env.S3_REGION ?? \"ap-northeast-2\",\n          bucket: process.env.S3_BUCKET ?? \"sonamu_default_bucket\",\n          visibility: \"private\",\n        }),\n      },\n    },\n    cache: {\n      default: \"main\",\n      stores: {\n        main: store().useL1Layer(cacheDrivers.memory({ maxSize: \"50mb\" })),\n      },\n      ttl: \"5m\",\n      prefix: \"\",\n    },\n    lifecycle: {\n      onStart: async () => {\n        // DB 마이그레이션 자동 실행 (테이블 없으면 생성)\n        try {\n          const { TokenModel } = await import(\"./application/token/token.model\");\n          const knex = TokenModel.getDB(\"w\");\n          const migrationsDir = path.join(import.meta.dirname, \"../src/migrations\");\n          const [batch, log] = await knex.migrate.latest({\n            directory: migrationsDir,\n          });\n          if (log.length > 0) {\n            console.log(`✓ Migration: ${log.length} applied (batch ${batch})`);\n            log.forEach((name: string) => console.log(`  ✓ ${name}`));\n          }\n        } catch (e) {\n          console.warn(`⚠ Migration skipped: ${(e as Error).message}`);\n        }\n\n        const { QgridDispatcher } = await import(\"./application/qgrid/qgrid.dispatcher\");\n        try {\n          const { TokenModel } = await import(\"./application/token/token.model\");\n          const entries = await TokenModel.findActive(\"A\");\n          for (const e of entries) QgridDispatcher.addToken(e.token, e.name);\n          console.log(\n            `🌲 Server listening on http://${host}:${port} (${QgridDispatcher.tokens.size} tokens loaded)`,\n          );\n        } catch (e) {\n          console.warn(`⚠ Dispatcher init failed: ${(e as Error).message}`);\n          console.log(`🌲 Server listening on http://${host}:${port} (no tokens)`);\n        }\n      },\n      onShutdown: () => {\n        console.log(\"graceful shutdown\");\n      },\n      onError: (error, _request, reply) => {\n        console.error(error);\n        reply.status(500).send({\n          name: error.name,\n          message: error.message,\n        });\n      },\n    },\n  },\n});\n"],"mappings":"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"}
|
|
193
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"sonamu.config.js","names":["cacheDrivers"],"sources":["../src/sonamu.config.ts"],"sourcesContent":["import path from \"path\";\n\nimport { getConsoleSink } from \"@logtape/logtape\";\nimport { getPrettyFormatter } from \"@logtape/pretty\";\nimport dotenv from \"dotenv\";\nimport { CachePresets, defineConfig } from \"sonamu\";\nimport { drivers as cacheDrivers, store } from \"sonamu/cache\";\n\ndotenv.config({ path: path.join(import.meta.dirname, \"../.env\") });\n\nconst host = process.env.HOST ?? \"localhost\";\nconst port = Number(process.env.PORT ?? 44900);\n\nconst connConfig = {\n  host: process.env.QGRID_DB_HOST ?? \"localhost\",\n  port: Number(process.env.QGRID_DB_PORT ?? 44901),\n  user: process.env.QGRID_DB_USER ?? \"postgres\",\n  password: process.env.QGRID_DB_PASSWORD ?? \"postgres\",\n  database: process.env.QGRID_DB_NAME ?? \"qgrid\",\n};\n\nexport default defineConfig({\n  projectName: process.env.PROJECT_NAME ?? \"SonamuProject\",\n  database: {\n    name: process.env.QGRID_DB_NAME ?? \"qgrid\",\n    defaultOptions: {\n      connection: {\n        ...connConfig,\n        keepAlive: true,\n        keepAliveInitialDelayMillis: 10000,\n      },\n    },\n    environments: {\n      fixture: {\n        connection: {\n          host: process.env.DEV0_DB_HOST,\n          port: Number(process.env.DEV0_DB_PORT),\n          database: process.env.QGRID_DB_NAME + \"_fixture\",\n          user: process.env.DEV0_DB_USER,\n          password: process.env.DEV0_DB_PASSWORD,\n        },\n      },\n      test: {\n        connection: {\n          host: \"0.0.0.0\",\n          port: 54321,\n          database: \"qgrid_test\",\n          user: \"postgres\",\n          password: \"postgres\",\n        },\n      },\n    },\n  },\n  api: {\n    dir: \"api\",\n    timezone: \"Asia/Seoul\",\n    route: {\n      prefix: \"/api\",\n    },\n  },\n  i18n: {\n    defaultLocale: \"ko\",\n    supportedLocales: [\"ko\", \"en\"],\n  },\n  sync: {\n    targets: [\"web\"],\n  },\n  slackConfirm:\n    process.env.SLACK_BOT_TOKEN && process.env.SLACK_CHANNEL_ID\n      ? {\n          targets: [\"development_master\", \"production_master\"],\n          botToken: process.env.SLACK_BOT_TOKEN ?? \"\",\n          channelId: process.env.SLACK_CHANNEL_ID ?? \"\",\n        }\n      : undefined,\n  test: {\n    parallel: true,\n    maxWorkers: 4,\n    devRunner: { enabled: true },\n  },\n  logging: {\n    sinks: {\n      console: getConsoleSink({\n        formatter: getPrettyFormatter({\n          timestamp: \"time\",\n          categoryWidth: 20,\n          categoryTruncate: \"middle\",\n        }),\n      }),\n    },\n    loggers: [\n      // qgrid 로그 (요청 분배, oauth/usage API)\n      { category: [\"qgrid\"], sinks: [\"console\"], lowestLevel: \"info\" },\n      // sonamu 로그는 warning 이상만\n      { category: [\"sonamu\"], sinks: [\"console\"], lowestLevel: \"warning\" },\n      // fastify 로그 차단\n      { category: [\"fastify\"], sinks: [], lowestLevel: \"fatal\" },\n    ],\n  },\n  server: {\n    listen: { port, host },\n    plugins: {\n      formbody: true,\n      qs: true,\n      multipart: { limits: { fileSize: 1024 * 1024 * 30 } },\n      static: {\n        root: path.join(import.meta.dirname, \"/../\", \"public\"),\n        prefix: \"/api/public\",\n      },\n      custom: (server) => {\n        // OAuth 콜백 — Anthropic이 /callback으로 리다이렉트\n        server.get(\"/callback\", async (request, reply) => {\n          const { code, state } = request.query as { code?: string; state?: string };\n          if (!code || !state) {\n            return reply.redirect(\"/?oauth=error&reason=missing_params\");\n          }\n          // Frame의 oauthCallback으로 위임\n          try {\n            const { QgridFrame } = await import(\"./application/qgrid/qgrid.frame\");\n            await QgridFrame.handleOAuthCallback(code, state, reply);\n          } catch (e) {\n            return reply.redirect(\n              `/?oauth=error&reason=${encodeURIComponent((e as Error).message)}`,\n            );\n          }\n        });\n      },\n    },\n    apiConfig: {\n      contextProvider: (defaultContext, request) => {\n        return {\n          ...defaultContext,\n          ip: request.ip,\n          body: request.body,\n        };\n      },\n      guardHandler: () => {},\n      cacheControlHandler: (req) => {\n        switch (req.type) {\n          case \"assets\":\n            // Hash 포함된 파일: 영구 캐시\n            if (req.path.match(/-[a-f0-9]+\\./)) {\n              return CachePresets.immutable;\n            }\n            return CachePresets.longLived;\n\n          case \"api\":\n            // GET 요청만 캐싱 고려\n            if (req.method === \"GET\") {\n              // 특정 경로는 짧은 캐시\n              if (req.path.startsWith(\"/api/static-data\")) {\n                return CachePresets.shortLived;\n              }\n              if (req.path.startsWith(\"/api/terms\")) {\n                return CachePresets.mediumLived;\n              }\n            }\n            // 기본: 캐시 없음\n            return CachePresets.noCache;\n\n          case \"ssr\":\n            // SSR 페이지: 10초 캐시\n            return CachePresets.ssr;\n\n          case \"csr\":\n            // CSR fallback (index.html): 1분 캐시\n            return CachePresets.shortLived;\n        }\n      },\n    },\n    cache: {\n      default: \"main\",\n      stores: {\n        main: store().useL1Layer(cacheDrivers.memory({ maxSize: \"50mb\" })),\n      },\n      ttl: \"5m\",\n      prefix: \"\",\n    },\n    lifecycle: {\n      onStart: async () => {\n        // DB 마이그레이션 자동 실행 (테이블 없으면 생성)\n        try {\n          const { TokenModel } = await import(\"./application/token/token.model\");\n          const knex = TokenModel.getDB(\"w\");\n          const migrationsDir = path.join(import.meta.dirname, \"../src/migrations\");\n          const [batch, log] = await knex.migrate.latest({\n            directory: migrationsDir,\n          });\n          if (log.length > 0) {\n            console.log(`✓ Migration: ${log.length} applied (batch ${batch})`);\n            log.forEach((name: string) => console.log(`  ✓ ${name}`));\n          }\n        } catch (e) {\n          console.warn(`⚠ Migration skipped: ${(e as Error).message}`);\n        }\n\n        const { QgridDispatcher } = await import(\"./application/qgrid/qgrid.dispatcher\");\n        const { ensureTokensTrigger } = await import(\"./application/qgrid/token-trigger-setup\");\n        const { TokenSubscriber } = await import(\"./application/qgrid/token-subscriber\");\n\n        let triggerReady = true;\n        try {\n          await ensureTokensTrigger(connConfig);\n        } catch (e) {\n          triggerReady = false;\n          console.warn(\n            `⚠ Token trigger setup failed: ${(e as Error).message}. Continuing with LISTEN/reconcile.`,\n          );\n        }\n\n        const subscriber = new TokenSubscriber(connConfig, QgridDispatcher);\n        QgridDispatcher.subscriber = subscriber;\n\n        const started = await subscriber.start();\n        const tokenInfo = started\n          ? `${QgridDispatcher.tokens.size} active tokens, LISTEN active`\n          : `degraded — token sync retry scheduled`;\n        const triggerInfo = triggerReady ? \"\" : \", trigger setup failed\";\n        console.log(`🌲 Server listening on http://${host}:${port} (${tokenInfo}${triggerInfo})`);\n      },\n      onShutdown: async () => {\n        const { QgridDispatcher } = await import(\"./application/qgrid/qgrid.dispatcher\");\n        if (QgridDispatcher.subscriber) {\n          await QgridDispatcher.subscriber.stop();\n        }\n        console.log(\"graceful shutdown\");\n      },\n      onError: (error, _request, reply) => {\n        console.error(error);\n        reply.status(500).send({\n          name: error.name,\n          message: error.message,\n        });\n      },\n    },\n  },\n});\n"],"mappings":"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"}
|
|
@@ -14,4 +14,4 @@ vi.mock("fs/promises", async (importOriginal) => {
|
|
|
14
14
|
//#endregion
|
|
15
15
|
export {};
|
|
16
16
|
|
|
17
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
17
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXAtbW9ja3MuanMiLCJuYW1lcyI6W10sInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3Rpbmcvc2V0dXAtbW9ja3MudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgdHlwZSBQYXRoTGlrZSB9IGZyb20gXCJmc1wiO1xuXG4vLyBpbXBvcnQgeyBOYWl0ZSB9IGZyb20gXCJzb25hbXVcIjtcbmltcG9ydCB7IHZpIH0gZnJvbSBcInZpdGVzdFwiO1xuXG4vLyBHbG9iYWxNb2NrOiBmcy9wcm9taXNlcyAo7IKs7JqpIOyYiOyLnCAtIO2VhOyalOyLnCDtmZzshLHtmZQpXG52aS5tb2NrKFwiZnMvcHJvbWlzZXNcIiwgYXN5bmMgKGltcG9ydE9yaWdpbmFsKSA9PiB7XG4gIGNvbnN0IGFjdHVhbCA9IChhd2FpdCBpbXBvcnRPcmlnaW5hbCgpKSBhcyB0eXBlb2YgaW1wb3J0KFwiZnMvcHJvbWlzZXNcIik7XG4gIHJldHVybiB7XG4gICAgLi4uYWN0dWFsLFxuICAgIGFjY2VzczogdmkuZm4oKHBhdGg6IFBhdGhMaWtlLCBtb2RlPzogbnVtYmVyKSA9PiB7XG4gICAgICAvLyBjb25zdCB2ZnMgPSBOYWl0ZS5nZXQoXCJtb2NrOmZzL3Byb21pc2VzOnZpcnR1YWxGaWxlU3lzdGVtXCIpLnJlc3VsdCgpO1xuICAgICAgLy8gaWYgKHZmcy5zb21lKCh2KSA9PiB2ID09PSBwYXRoKSkge1xuICAgICAgLy8gICByZXR1cm4gUHJvbWlzZS5yZXNvbHZlKCk7XG4gICAgICAvLyB9XG5cbiAgICAgIHJldHVybiBhY3R1YWwuYWNjZXNzKHBhdGgsIG1vZGUpO1xuICAgIH0pLFxuICAgIC8vIG1rZGlyOiB2aS5mbihcbiAgICAvLyAgIGFzeW5jIChcbiAgICAvLyAgICAgcGF0aDogUGF0aExpa2UsXG4gICAgLy8gICAgIG9wdGlvbnM/OiBNYWtlRGlyZWN0b3J5T3B0aW9ucyB8IE1vZGUgfCBudWxsLFxuICAgIC8vICAgKTogUHJvbWlzZTxzdHJpbmcgfCB1bmRlZmluZWQ+ID0+IHtcbiAgICAvLyAgICAgLy8gTmFpdGUudChcImZzOm1rZGlyXCIsIHsgcGF0aCwgb3B0aW9ucyB9KTtcbiAgICAvLyAgICAgaWYgKHR5cGVvZiBvcHRpb25zID09PSBcIm9iamVjdFwiICYmIG9wdGlvbnM/LnJlY3Vyc2l2ZSkge1xuICAgIC8vICAgICAgIHJldHVybiB0eXBlb2YgcGF0aCA9PT0gXCJzdHJpbmdcIiA/IHBhdGggOiBwYXRoLnRvU3RyaW5nKCk7XG4gICAgLy8gICAgIH1cbiAgICAvLyAgICAgcmV0dXJuIHVuZGVmaW5lZDtcbiAgICAvLyAgIH0sXG4gICAgLy8gKSxcbiAgICAvLyB3cml0ZUZpbGU6IHZpLmZuKChwYXRoOiBQYXRoTGlrZSB8IEZpbGVIYW5kbGUsIGRhdGE6IHN0cmluZyB8IEJ1ZmZlciB8IFVpbnQ4QXJyYXkpID0+IHtcbiAgICAvLyAgIGNvbnN0IGZpbGVQYXRoID0gdHlwZW9mIHBhdGggPT09IFwic3RyaW5nXCIgPyBwYXRoIDogcGF0aC50b1N0cmluZygpO1xuXG4gICAgLy8gICAvLyBOYWl0ZS50KGBmcy9wcm9taXNlczp3cml0ZUZpbGVgLCB7IHBhdGg6IGZpbGVQYXRoLCBkYXRhIH0pO1xuICAgIC8vIH0pLFxuICAgIC8vIHJtOiB2aS5mbihhc3luYyAocGF0aDogUGF0aExpa2UsIG9wdGlvbnM/OiBSbU9wdGlvbnMpID0+IHtcbiAgICAvLyAgIGNvbnN0IGZpbGVQYXRoID0gdHlwZW9mIHBhdGggPT09IFwic3RyaW5nXCIgPyBwYXRoIDogcGF0aC50b1N0cmluZygpO1xuXG4gICAgLy8gICAvLyBOYWl0ZS50KGBmcy9wcm9taXNlczpybWAsIHsgcGF0aDogZmlsZVBhdGgsIG9wdGlvbnMgfSk7XG4gICAgLy8gICAvLyDsi6TsoJwg7IKt7KCc7ZWY7KeAIOyViuqzoCDquLDroZ3rp4wg7ZWoXG4gICAgLy8gICByZXR1cm4gUHJvbWlzZS5yZXNvbHZlKCk7XG4gICAgLy8gfSksXG4gIH07XG59KTtcbiJdLCJtYXBwaW5ncyI6Ijs7OztBQU1BLEdBQUcsS0FBSyxlQUFlLE9BQU8sbUJBQW1CO0NBQy9DLE1BQU0sU0FBVSxNQUFNLGdCQUFnQjtBQUN0QyxRQUFPO0VBQ0wsR0FBRztFQUNILFFBQVEsR0FBRyxJQUFJLE1BQWdCLFNBQWtCO0FBTS9DLFVBQU8sT0FBTyxPQUFPLE1BQU0sS0FBSztJQUNoQztFQXlCSDtFQUNEIn0=
|
|
@@ -9,4 +9,4 @@ function getSubsetLoaders(subsets, subsetQueries) {
|
|
|
9
9
|
//#endregion
|
|
10
10
|
export { getSubsetLoaders };
|
|
11
11
|
|
|
12
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
12
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3Vic2V0LWxvYWRlcnMuanMiLCJuYW1lcyI6W10sInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3N1YnNldC1sb2FkZXJzLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHR5cGUgU3Vic2V0UXVlcnkgfSBmcm9tIFwic29uYW11XCI7XG5cbmV4cG9ydCBmdW5jdGlvbiBnZXRTdWJzZXRMb2FkZXJzKHN1YnNldHM6IHN0cmluZ1tdLCBzdWJzZXRRdWVyaWVzOiBSZWNvcmQ8c3RyaW5nLCBTdWJzZXRRdWVyeT4pIHtcbiAgcmV0dXJuIHN1YnNldHMucmVkdWNlKFxuICAgIChhY2MsIHN1YnNldCkgPT4ge1xuICAgICAgYWNjW3N1YnNldF0gPSBzdWJzZXRRdWVyaWVzW3N1YnNldF0/LmxvYWRlcnMgPz8gW107XG4gICAgICByZXR1cm4gYWNjO1xuICAgIH0sXG4gICAge30gYXMgUmVjb3JkPHN0cmluZywgU3Vic2V0UXVlcnlbXCJsb2FkZXJzXCJdPixcbiAgKTtcbn1cbiJdLCJtYXBwaW5ncyI6Ijs7QUFFQSxTQUFnQixpQkFBaUIsU0FBbUIsZUFBNEM7QUFDOUYsUUFBTyxRQUFRLFFBQ1osS0FBSyxXQUFXO0FBQ2YsTUFBSSxVQUFVLGNBQWMsU0FBUyxXQUFXLEVBQUU7QUFDbEQsU0FBTztJQUVULEVBQUUsQ0FDSCJ9
|
|
@@ -3,8 +3,12 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import { createHash, randomBytes } from "node:crypto";
|
|
5
5
|
|
|
6
|
+
import { getLogger } from "@logtape/logtape";
|
|
7
|
+
|
|
6
8
|
import { type UsageResponse } from "./qgrid.types";
|
|
7
9
|
|
|
10
|
+
const logger = getLogger(["qgrid", "oauth"]);
|
|
11
|
+
|
|
8
12
|
const CLIENT_ID = "9d1c250a-e61b-44d9-88ed-5944d1962f5e";
|
|
9
13
|
const AUTHORIZE_URL = "https://claude.com/cai/oauth/authorize";
|
|
10
14
|
const TOKEN_URL = "https://platform.claude.com/v1/oauth/token";
|
|
@@ -139,7 +143,6 @@ export async function fetchUsage(accessToken: string): Promise<UsageResponse> {
|
|
|
139
143
|
const cacheKey = accessToken.slice(-10);
|
|
140
144
|
const cached = usageCache[cacheKey];
|
|
141
145
|
if (cached && Date.now() - cached.cachedAt < USAGE_API_CACHE_TTL) {
|
|
142
|
-
console.log(`[usage] cache hit: ${cacheKey}`);
|
|
143
146
|
return cached.data;
|
|
144
147
|
}
|
|
145
148
|
|
|
@@ -163,7 +166,7 @@ export async function fetchUsage(accessToken: string): Promise<UsageResponse> {
|
|
|
163
166
|
// 파싱 안 되면 기본 메시지
|
|
164
167
|
}
|
|
165
168
|
|
|
166
|
-
|
|
169
|
+
logger.warn(`${res.status}: ${errorMessage}`);
|
|
167
170
|
|
|
168
171
|
// 이전 성공 캐시 있으면 유지
|
|
169
172
|
if (cached?.data && !cached.data.error) return cached.data;
|
|
@@ -4,6 +4,8 @@
|
|
|
4
4
|
* - 매 요청마다 새 claude CLI 프로세스 spawn → 응답 후 종료
|
|
5
5
|
* - system 은 --append-system-prompt 로 분리 전달 (user turn 오염 방지)
|
|
6
6
|
* - least-used round-robin 으로 토큰 선택
|
|
7
|
+
* - 메모리 캐시 (Map<id, TokenSubsetA>) 는 TokenSubscriber 가 pg LISTEN/NOTIFY 로 갱신
|
|
8
|
+
* - query 시 expires_at 비교 → 임박 시 preemptive refresh
|
|
7
9
|
* - QuotaError 는 그대로 상위 전파 (자동 failover 없음, UI 에서 수동 토글)
|
|
8
10
|
*
|
|
9
11
|
* env allowlist: PATH, TMPDIR, CLAUDE_CODE_OAUTH_TOKEN + CLAUDE_CODE_DISABLE_*
|
|
@@ -11,8 +13,14 @@
|
|
|
11
13
|
import { spawn } from "node:child_process";
|
|
12
14
|
import { mkdirSync, writeFileSync } from "node:fs";
|
|
13
15
|
|
|
16
|
+
import { getLogger } from "@logtape/logtape";
|
|
17
|
+
|
|
18
|
+
import { type TokenSubsetA } from "../sonamu.generated";
|
|
14
19
|
import { type CliResult, type QueryInput, type TokenStats } from "./qgrid.types";
|
|
15
20
|
import { maskToken, ProcessError, QuotaError, TimeoutError } from "./qgrid.types";
|
|
21
|
+
import { type TokenSubscriber } from "./token-subscriber";
|
|
22
|
+
|
|
23
|
+
const logger = getLogger(["qgrid"]);
|
|
16
24
|
|
|
17
25
|
const DEFAULT_MODEL = "sonnet";
|
|
18
26
|
const DEFAULT_TIMEOUT_MS = 600_000;
|
|
@@ -28,11 +36,19 @@ const QGRID_CLAUDE_SETTINGS = {
|
|
|
28
36
|
cleanupPeriodDays: 1,
|
|
29
37
|
};
|
|
30
38
|
|
|
31
|
-
|
|
32
|
-
|
|
39
|
+
// 토큰 만료 임박 임계값 — token.expiredAt이 1분 안에 만료된다면 query 시 체크하고 refresh.
|
|
40
|
+
const REFRESH_SAFETY_MS = 60_000;
|
|
41
|
+
|
|
42
|
+
export class QgridDispatcherClass {
|
|
43
|
+
tokens = new Map<number, TokenSubsetA>();
|
|
44
|
+
|
|
45
|
+
// key기반(tokenName) 누적 카운터. token 이 OAuth refresh 로 로테이트되도 tokenName 은 불변이라 카운터 유지됨
|
|
33
46
|
requestCounts = new Map<string, number>();
|
|
34
47
|
rrIndex = 0;
|
|
35
48
|
|
|
49
|
+
// sonamu.config onStart 에서 처리하는 변수
|
|
50
|
+
subscriber: TokenSubscriber | null = null;
|
|
51
|
+
|
|
36
52
|
constructor() {
|
|
37
53
|
mkdirSync(`${CLAUDE_CWD}/.claude`, { recursive: true });
|
|
38
54
|
writeFileSync(
|
|
@@ -41,51 +57,75 @@ class QgridDispatcherClass {
|
|
|
41
57
|
);
|
|
42
58
|
}
|
|
43
59
|
|
|
60
|
+
countOf(name: string): number {
|
|
61
|
+
return this.requestCounts.get(name) ?? 0;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
// TokenSubscriber 콜백 — 캐시 mutation
|
|
65
|
+
upsertCache(id: number, row: TokenSubsetA): void {
|
|
66
|
+
this.tokens.set(id, row);
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
removeCache(id: number): void {
|
|
70
|
+
this.tokens.delete(id);
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
replaceCache(rows: TokenSubsetA[]): void {
|
|
74
|
+
this.tokens = new Map(rows.map((r) => [r.id, r]));
|
|
75
|
+
}
|
|
76
|
+
|
|
44
77
|
getStats(): TokenStats[] {
|
|
45
|
-
return [...this.tokens.
|
|
46
|
-
token,
|
|
47
|
-
name,
|
|
48
|
-
requests: this.
|
|
78
|
+
return [...this.tokens.values()].map((r) => ({
|
|
79
|
+
token: r.token,
|
|
80
|
+
name: r.name,
|
|
81
|
+
requests: this.countOf(r.name),
|
|
49
82
|
}));
|
|
50
83
|
}
|
|
51
84
|
|
|
52
|
-
selectToken():
|
|
53
|
-
const
|
|
54
|
-
if (
|
|
85
|
+
selectToken(): TokenSubsetA | null {
|
|
86
|
+
const rows = [...this.tokens.values()];
|
|
87
|
+
if (rows.length === 0) return null;
|
|
55
88
|
|
|
56
|
-
const minCount = Math.min(...
|
|
57
|
-
const idle =
|
|
89
|
+
const minCount = Math.min(...rows.map((r) => this.countOf(r.name)));
|
|
90
|
+
const idle = rows.filter((r) => this.countOf(r.name) === minCount);
|
|
58
91
|
const picked = idle[this.rrIndex % idle.length]!;
|
|
59
92
|
this.rrIndex++;
|
|
60
|
-
return
|
|
93
|
+
return picked;
|
|
61
94
|
}
|
|
62
95
|
|
|
63
96
|
async query(input: QueryInput, timeoutMs?: number): Promise<CliResult> {
|
|
64
|
-
const
|
|
65
|
-
if (!
|
|
97
|
+
const electedToken = this.selectToken();
|
|
98
|
+
if (!electedToken) throw new QuotaError("No tokens available");
|
|
66
99
|
|
|
67
100
|
// await 전에 count 선반영. 병렬 요청이 동시에 도착해도 각자 다른 토큰을 고르도록.
|
|
68
|
-
this.requestCounts.set(
|
|
101
|
+
this.requestCounts.set(electedToken.name, this.countOf(electedToken.name) + 1);
|
|
69
102
|
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
103
|
+
let token = electedToken.token;
|
|
104
|
+
// expires_at 임박이면 refresh.
|
|
105
|
+
// refresh 후 DB save → trigger NOTIFY → subscriber 가 받아 캐시 갱신 (다른 dispatcher 도 동기화)
|
|
106
|
+
if (
|
|
107
|
+
electedToken.expires_at &&
|
|
108
|
+
Number(electedToken.expires_at) - Date.now() < REFRESH_SAFETY_MS &&
|
|
109
|
+
electedToken.refresh_token
|
|
110
|
+
) {
|
|
111
|
+
try {
|
|
112
|
+
const { QgridFrame } = await import("./qgrid.frame");
|
|
113
|
+
token = await QgridFrame.refreshToken({
|
|
114
|
+
id: electedToken.id,
|
|
115
|
+
token: electedToken.token,
|
|
116
|
+
name: electedToken.name,
|
|
117
|
+
refresh_token: electedToken.refresh_token,
|
|
118
|
+
});
|
|
119
|
+
} catch (e) {
|
|
120
|
+
logger.warn(`refresh failed for ${electedToken.name}: ${(e as Error).message}`);
|
|
121
|
+
// refresh 실패 시 기존 token 으로 진행. executeClaude 가 401 받으면 caller 처리.
|
|
122
|
+
}
|
|
123
|
+
}
|
|
81
124
|
|
|
82
|
-
|
|
83
|
-
this.tokens.delete(token);
|
|
84
|
-
this.requestCounts.delete(token);
|
|
85
|
-
}
|
|
125
|
+
logger.info(`→ ${electedToken.name} (model: ${input.model ?? DEFAULT_MODEL})`);
|
|
86
126
|
|
|
87
|
-
|
|
88
|
-
return
|
|
127
|
+
const result = await executeClaude(input, token, timeoutMs ?? DEFAULT_TIMEOUT_MS);
|
|
128
|
+
return { ...result, tokenName: electedToken.name, model: input.model ?? DEFAULT_MODEL };
|
|
89
129
|
}
|
|
90
130
|
}
|
|
91
131
|
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { getLogger } from "@logtape/logtape";
|
|
1
2
|
import { type FastifyReply } from "fastify";
|
|
2
3
|
import { api, BaseFrameClass } from "sonamu";
|
|
3
4
|
|
|
@@ -21,6 +22,8 @@ import {
|
|
|
21
22
|
} from "./qgrid.types";
|
|
22
23
|
|
|
23
24
|
const pendingOAuth = new Map<string, { codeVerifier: string; name: string; redirectUri: string }>();
|
|
25
|
+
const logger = getLogger(["qgrid"]);
|
|
26
|
+
const oauthLogger = getLogger(["qgrid", "oauth"]);
|
|
24
27
|
|
|
25
28
|
class QgridFrameClass extends BaseFrameClass {
|
|
26
29
|
constructor() {
|
|
@@ -53,7 +56,7 @@ class QgridFrameClass extends BaseFrameClass {
|
|
|
53
56
|
duration_ms: result.durationMs,
|
|
54
57
|
cost_usd: result.costUsd !== null ? Math.round(result.costUsd * MICRO_USD) : null,
|
|
55
58
|
},
|
|
56
|
-
]).catch((e) =>
|
|
59
|
+
]).catch((e) => logger.error(`requestLog save failed: ${(e as Error).message}`));
|
|
57
60
|
|
|
58
61
|
return result;
|
|
59
62
|
}
|
|
@@ -82,7 +85,6 @@ class QgridFrameClass extends BaseFrameClass {
|
|
|
82
85
|
...(refreshToken && refreshToken.length > 0 ? { refresh_token: refreshToken } : {}),
|
|
83
86
|
},
|
|
84
87
|
]);
|
|
85
|
-
QgridDispatcher.addToken(token, name);
|
|
86
88
|
return { added: true };
|
|
87
89
|
}
|
|
88
90
|
|
|
@@ -106,28 +108,19 @@ class QgridFrameClass extends BaseFrameClass {
|
|
|
106
108
|
...(hasRefreshToken ? { refresh_token: refreshToken } : {}),
|
|
107
109
|
},
|
|
108
110
|
]);
|
|
109
|
-
|
|
110
|
-
if (hasNewToken) {
|
|
111
|
-
QgridDispatcher.removeToken(token);
|
|
112
|
-
QgridDispatcher.addToken(newToken, name ?? entry.name);
|
|
113
|
-
}
|
|
114
111
|
return { updated: true };
|
|
115
112
|
}
|
|
116
113
|
|
|
117
114
|
@api({ httpMethod: "POST", clients: ["axios", "tanstack-mutation"] })
|
|
118
115
|
async removeToken(token: string): Promise<{ removed: boolean }> {
|
|
119
|
-
if (!QgridDispatcher.hasToken(token)) return { removed: false };
|
|
120
|
-
|
|
121
116
|
const entry = await TokenModel.findByToken("A", token);
|
|
122
|
-
if (entry)
|
|
123
|
-
|
|
117
|
+
if (!entry) return { removed: false };
|
|
118
|
+
await TokenModel.del([entry.id]);
|
|
124
119
|
return { removed: true };
|
|
125
120
|
}
|
|
126
121
|
|
|
127
122
|
/**
|
|
128
|
-
*
|
|
129
|
-
* 토큰 활성화/비활성화 토글 (dispatcher 등록/제거 & DB의 active 필드 업데이트)
|
|
130
|
-
* @returns 토큰 활성화 여부
|
|
123
|
+
* 토큰 활성화/비활성화 토글 DB의 active 필드 업데이트
|
|
131
124
|
*/
|
|
132
125
|
@api({ httpMethod: "POST", clients: ["axios", "tanstack-mutation"] })
|
|
133
126
|
async toggleToken(id: number): Promise<{ active: boolean }> {
|
|
@@ -136,13 +129,6 @@ class QgridFrameClass extends BaseFrameClass {
|
|
|
136
129
|
|
|
137
130
|
const newActive = !entry.active;
|
|
138
131
|
await TokenModel.save([{ id, token: entry.token, active: newActive, name: entry.name }]);
|
|
139
|
-
|
|
140
|
-
if (newActive) {
|
|
141
|
-
QgridDispatcher.addToken(entry.token, entry.name);
|
|
142
|
-
} else {
|
|
143
|
-
QgridDispatcher.removeToken(entry.token);
|
|
144
|
-
}
|
|
145
|
-
|
|
146
132
|
return { active: newActive };
|
|
147
133
|
}
|
|
148
134
|
|
|
@@ -178,7 +164,6 @@ class QgridFrameClass extends BaseFrameClass {
|
|
|
178
164
|
if (tokens.accountUuid) {
|
|
179
165
|
const oldEntries = await TokenModel.findByAccountUuid("A", tokens.accountUuid);
|
|
180
166
|
if (oldEntries.length > 0) {
|
|
181
|
-
for (const old of oldEntries) QgridDispatcher.removeToken(old.token);
|
|
182
167
|
await TokenModel.del(oldEntries.map((o) => o.id));
|
|
183
168
|
}
|
|
184
169
|
}
|
|
@@ -192,7 +177,6 @@ class QgridFrameClass extends BaseFrameClass {
|
|
|
192
177
|
account_uuid: tokens.accountUuid,
|
|
193
178
|
},
|
|
194
179
|
]);
|
|
195
|
-
QgridDispatcher.addToken(tokens.accessToken, pending.name);
|
|
196
180
|
|
|
197
181
|
return reply.redirect(`/?oauth=success&name=${encodeURIComponent(pending.name)}`);
|
|
198
182
|
} catch (e) {
|
|
@@ -216,7 +200,7 @@ class QgridFrameClass extends BaseFrameClass {
|
|
|
216
200
|
try {
|
|
217
201
|
accessToken = await this.refreshToken(entry);
|
|
218
202
|
} catch (e) {
|
|
219
|
-
|
|
203
|
+
oauthLogger.warn(`refresh failed for ${entry.name}: ${(e as Error).message}`);
|
|
220
204
|
return { error: "re-login required" };
|
|
221
205
|
}
|
|
222
206
|
}
|
|
@@ -228,7 +212,7 @@ class QgridFrameClass extends BaseFrameClass {
|
|
|
228
212
|
accessToken = await this.refreshToken(entry);
|
|
229
213
|
return await fetchUsage(accessToken);
|
|
230
214
|
} catch (e) {
|
|
231
|
-
|
|
215
|
+
oauthLogger.warn(`refresh failed for ${entry.name}: ${(e as Error).message}`);
|
|
232
216
|
return { error: "re-login required" };
|
|
233
217
|
}
|
|
234
218
|
}
|
|
@@ -248,14 +232,16 @@ class QgridFrameClass extends BaseFrameClass {
|
|
|
248
232
|
name: token.name ?? "",
|
|
249
233
|
},
|
|
250
234
|
]);
|
|
251
|
-
QgridDispatcher.removeToken(token.token);
|
|
252
|
-
QgridDispatcher.addToken(refreshed.accessToken, token.name);
|
|
253
235
|
return refreshed.accessToken;
|
|
254
236
|
}
|
|
255
237
|
|
|
256
238
|
@api({ httpMethod: "GET", clients: ["axios", "tanstack-query"] })
|
|
257
239
|
async health(): Promise<HealthResponse> {
|
|
258
|
-
return {
|
|
240
|
+
return {
|
|
241
|
+
status: "ok",
|
|
242
|
+
activeTokens: QgridDispatcher.tokens.size,
|
|
243
|
+
subscriber: QgridDispatcher.subscriber?.status() ?? null,
|
|
244
|
+
};
|
|
259
245
|
}
|
|
260
246
|
}
|
|
261
247
|
|
|
@@ -82,9 +82,18 @@ export type UsageResponse = z.infer<typeof UsageResponse>;
|
|
|
82
82
|
|
|
83
83
|
// ─── Health ───
|
|
84
84
|
|
|
85
|
+
export const SubscriberStatus = z.object({
|
|
86
|
+
connected: z.boolean(),
|
|
87
|
+
connectedAt: z.date().nullable(),
|
|
88
|
+
lastReconcileAt: z.date().nullable(),
|
|
89
|
+
attempt: z.number(),
|
|
90
|
+
});
|
|
91
|
+
export type SubscriberStatus = z.infer<typeof SubscriberStatus>;
|
|
92
|
+
|
|
85
93
|
export const HealthResponse = z.object({
|
|
86
94
|
status: z.string(),
|
|
87
95
|
activeTokens: z.number(),
|
|
96
|
+
subscriber: SubscriberStatus.nullable(),
|
|
88
97
|
});
|
|
89
98
|
export type HealthResponse = z.infer<typeof HealthResponse>;
|
|
90
99
|
|