@cartanova/qgrid-cli 1.7.3 → 1.9.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/bundle/dist/application/qgrid/qgrid.dispatcher.js +72 -39
- package/bundle/dist/application/qgrid/qgrid.frame.js +12 -25
- package/bundle/dist/application/qgrid/qgrid.types.js +17 -4
- 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 +22 -36
- package/bundle/dist/testing/setup-mocks.js +1 -1
- package/bundle/dist/utils/subset-loaders.js +1 -1
- package/bundle/src/application/qgrid/qgrid.dispatcher.ts +103 -46
- package/bundle/src/application/qgrid/qgrid.frame.ts +14 -26
- package/bundle/src/application/qgrid/qgrid.types.ts +13 -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.http +2 -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 +33 -39
- 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-DxJOOfGV.js} +3 -3
- package/bundle/web-dist/client/assets/{logs-ci_3vzTT.js → logs-D83MPvLO.js} +1 -1
- package/bundle/web-dist/client/assets/{routes-Ch5LFN0K.js → routes-C1PeZiBp.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-BV5C1PQa.js} +1 -1
- package/bundle/web-dist/client/assets/{show-D3N15Krg.js → show-WxeogUIk.js} +1 -1
- package/bundle/web-dist/client/assets/tokens--RfCPd1y.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-9j6ES80h.js} +3 -3
- package/bundle/web-dist/server/assets/{routes-BLm-zF86.js → routes-DQh4d03H.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-Q2ZIxMdn.js} +5 -4
- 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-j1j13Hq1.js} +4 -4
- package/bundle/web-dist/server/assets/{tokens-rQIIgqMo.js → tokens-hSHCLF_7.js} +24 -5
- 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
|
@@ -5,20 +5,23 @@ import path from "path";
|
|
|
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
|
} },
|
|
@@ -134,29 +137,6 @@ var sonamu_config_default = defineConfig({
|
|
|
134
137
|
}
|
|
135
138
|
}
|
|
136
139
|
},
|
|
137
|
-
storage: { drivers: {
|
|
138
|
-
fs: drivers$1.fs({
|
|
139
|
-
location: path.join(import.meta.dirname, "/../public/uploaded"),
|
|
140
|
-
visibility: "public",
|
|
141
|
-
urlBuilder: {
|
|
142
|
-
async generateURL(key) {
|
|
143
|
-
return `/api/public/uploaded/${key}`;
|
|
144
|
-
},
|
|
145
|
-
async generateSignedURL(key) {
|
|
146
|
-
return `/api/public/uploaded/${key}`;
|
|
147
|
-
}
|
|
148
|
-
}
|
|
149
|
-
}),
|
|
150
|
-
s3: drivers$1.s3({
|
|
151
|
-
credentials: {
|
|
152
|
-
accessKeyId: process.env.AWS_ACCESS_KEY_ID ?? "",
|
|
153
|
-
secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY ?? ""
|
|
154
|
-
},
|
|
155
|
-
region: process.env.S3_REGION ?? "ap-northeast-2",
|
|
156
|
-
bucket: process.env.S3_BUCKET ?? "sonamu_default_bucket",
|
|
157
|
-
visibility: "private"
|
|
158
|
-
})
|
|
159
|
-
} },
|
|
160
140
|
cache: {
|
|
161
141
|
default: "main",
|
|
162
142
|
stores: { main: store().useL1Layer(drivers.memory({ maxSize: "50mb" })) },
|
|
@@ -178,17 +158,23 @@ var sonamu_config_default = defineConfig({
|
|
|
178
158
|
console.warn(`⚠ Migration skipped: ${e.message}`);
|
|
179
159
|
}
|
|
180
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;
|
|
181
164
|
try {
|
|
182
|
-
|
|
183
|
-
const entries = await TokenModel.findActive("A");
|
|
184
|
-
for (const e of entries) QgridDispatcher.addToken(e.token, e.name);
|
|
185
|
-
console.log(`🌲 Server listening on http://${host}:${port} (${QgridDispatcher.tokens.size} tokens loaded)`);
|
|
165
|
+
await ensureTokensTrigger(connConfig);
|
|
186
166
|
} catch (e) {
|
|
187
|
-
|
|
188
|
-
console.
|
|
167
|
+
triggerReady = false;
|
|
168
|
+
console.warn(`⚠ Token trigger setup failed: ${e.message}. Continuing with LISTEN/reconcile.`);
|
|
189
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"})`);
|
|
190
174
|
},
|
|
191
|
-
onShutdown: () => {
|
|
175
|
+
onShutdown: async () => {
|
|
176
|
+
const { QgridDispatcher } = await import("./application/qgrid/qgrid.dispatcher.js");
|
|
177
|
+
if (QgridDispatcher.subscriber) await QgridDispatcher.subscriber.stop();
|
|
192
178
|
console.log("graceful shutdown");
|
|
193
179
|
},
|
|
194
180
|
onError: (error, _request, reply) => {
|
|
@@ -204,4 +190,4 @@ var sonamu_config_default = defineConfig({
|
|
|
204
190
|
//#endregion
|
|
205
191
|
export { sonamu_config_default as default };
|
|
206
192
|
|
|
207
|
-
//# 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      // 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    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
|
|
@@ -2,94 +2,137 @@
|
|
|
2
2
|
* QgridDispatcher — OAuth 토큰 선택 + claude CLI fresh spawn 디스패처 싱글턴.
|
|
3
3
|
*
|
|
4
4
|
* - 매 요청마다 새 claude CLI 프로세스 spawn → 응답 후 종료
|
|
5
|
-
* - system 은 --append-system-prompt 로 분리 전달 (user turn 오염 방지)
|
|
6
5
|
* - least-used round-robin 으로 토큰 선택
|
|
6
|
+
* - 메모리 캐시 (Map<id, TokenSubsetA>) 는 TokenSubscriber 가 pg LISTEN/NOTIFY 로 갱신
|
|
7
|
+
* - query 시 expires_at 비교 → 임박 시 preemptive refresh
|
|
7
8
|
* - QuotaError 는 그대로 상위 전파 (자동 failover 없음, UI 에서 수동 토글)
|
|
8
9
|
*
|
|
9
|
-
* env allowlist: PATH, TMPDIR, CLAUDE_CODE_OAUTH_TOKEN
|
|
10
|
+
* env allowlist: PATH, TMPDIR, CLAUDE_CODE_OAUTH_TOKEN, CLAUDE_CONFIG_DIR
|
|
11
|
+
* + CLAUDE_CODE_DISABLE_* + CLAUDE_CODE_ATTRIBUTION_HEADER
|
|
10
12
|
*/
|
|
11
13
|
import { spawn } from "node:child_process";
|
|
12
14
|
import { mkdirSync, writeFileSync } from "node:fs";
|
|
13
15
|
|
|
14
16
|
import { getLogger } from "@logtape/logtape";
|
|
15
17
|
|
|
18
|
+
import { type TokenSubsetA } from "../sonamu.generated";
|
|
16
19
|
import { type CliResult, type QueryInput, type TokenStats } from "./qgrid.types";
|
|
17
20
|
import { maskToken, ProcessError, QuotaError, TimeoutError } from "./qgrid.types";
|
|
21
|
+
import { type TokenSubscriber } from "./token-subscriber";
|
|
18
22
|
|
|
19
23
|
const logger = getLogger(["qgrid"]);
|
|
20
24
|
|
|
21
25
|
const DEFAULT_MODEL = "sonnet";
|
|
22
26
|
const DEFAULT_TIMEOUT_MS = 600_000;
|
|
27
|
+
const DEFAULT_EFFORT = "high";
|
|
23
28
|
|
|
24
29
|
// claude CLI 의 cwd. 이 경로의 .claude/settings.json 이 project scope 로 로드되어
|
|
25
30
|
// 혹시라도 있을 user scope (~/.claude/settings.json)를 덮어씀 (--setting-sources project 와 함께).
|
|
26
31
|
const CLAUDE_CWD = "/tmp/qgrid";
|
|
27
32
|
|
|
28
|
-
//
|
|
33
|
+
// 글로벌 user config 격리 경로. (CC에서 환경변수로 읽는변수)
|
|
34
|
+
const CLAUDE_CONFIG_DIR = "/tmp/qgrid-config";
|
|
35
|
+
|
|
36
|
+
// qgrid 전용 project/global settings — user scope 격리용
|
|
29
37
|
const QGRID_CLAUDE_SETTINGS = {
|
|
30
38
|
alwaysThinkingEnabled: false, // thinking block 차단
|
|
31
39
|
includeGitInstructions: false, // system prompt 의 git 가이드 제거
|
|
32
40
|
cleanupPeriodDays: 1,
|
|
33
41
|
};
|
|
34
42
|
|
|
35
|
-
|
|
36
|
-
|
|
43
|
+
// 토큰 만료 임박 임계값 — token.expiredAt이 1분 안에 만료된다면 query 시 체크하고 refresh.
|
|
44
|
+
const REFRESH_SAFETY_MS = 60_000;
|
|
45
|
+
|
|
46
|
+
export class QgridDispatcherClass {
|
|
47
|
+
tokens = new Map<number, TokenSubsetA>();
|
|
48
|
+
|
|
49
|
+
// key기반(tokenName) 누적 카운터. token 이 OAuth refresh 로 로테이트되도 tokenName 은 불변이라 카운터 유지됨
|
|
37
50
|
requestCounts = new Map<string, number>();
|
|
38
51
|
rrIndex = 0;
|
|
39
52
|
|
|
53
|
+
// sonamu.config onStart 에서 처리하는 변수
|
|
54
|
+
subscriber: TokenSubscriber | null = null;
|
|
55
|
+
|
|
40
56
|
constructor() {
|
|
57
|
+
const settingsJson = JSON.stringify(QGRID_CLAUDE_SETTINGS, null, 2);
|
|
58
|
+
|
|
41
59
|
mkdirSync(`${CLAUDE_CWD}/.claude`, { recursive: true });
|
|
42
|
-
writeFileSync(
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
);
|
|
60
|
+
writeFileSync(`${CLAUDE_CWD}/.claude/settings.json`, settingsJson);
|
|
61
|
+
|
|
62
|
+
mkdirSync(CLAUDE_CONFIG_DIR, { recursive: true });
|
|
63
|
+
writeFileSync(`${CLAUDE_CONFIG_DIR}/.claude.json`, "{}");
|
|
64
|
+
writeFileSync(`${CLAUDE_CONFIG_DIR}/settings.json`, settingsJson);
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
countOf(name: string): number {
|
|
68
|
+
return this.requestCounts.get(name) ?? 0;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
// TokenSubscriber 콜백 — 캐시 mutation
|
|
72
|
+
upsertCache(id: number, row: TokenSubsetA): void {
|
|
73
|
+
this.tokens.set(id, row);
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
removeCache(id: number): void {
|
|
77
|
+
this.tokens.delete(id);
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
replaceCache(rows: TokenSubsetA[]): void {
|
|
81
|
+
this.tokens = new Map(rows.map((r) => [r.id, r]));
|
|
46
82
|
}
|
|
47
83
|
|
|
48
84
|
getStats(): TokenStats[] {
|
|
49
|
-
return [...this.tokens.
|
|
50
|
-
token,
|
|
51
|
-
name,
|
|
52
|
-
requests: this.
|
|
85
|
+
return [...this.tokens.values()].map((r) => ({
|
|
86
|
+
token: r.token,
|
|
87
|
+
name: r.name,
|
|
88
|
+
requests: this.countOf(r.name),
|
|
53
89
|
}));
|
|
54
90
|
}
|
|
55
91
|
|
|
56
|
-
selectToken():
|
|
57
|
-
const
|
|
58
|
-
if (
|
|
92
|
+
selectToken(): TokenSubsetA | null {
|
|
93
|
+
const rows = [...this.tokens.values()];
|
|
94
|
+
if (rows.length === 0) return null;
|
|
59
95
|
|
|
60
|
-
const minCount = Math.min(...
|
|
61
|
-
const idle =
|
|
96
|
+
const minCount = Math.min(...rows.map((r) => this.countOf(r.name)));
|
|
97
|
+
const idle = rows.filter((r) => this.countOf(r.name) === minCount);
|
|
62
98
|
const picked = idle[this.rrIndex % idle.length]!;
|
|
63
99
|
this.rrIndex++;
|
|
64
|
-
return
|
|
100
|
+
return picked;
|
|
65
101
|
}
|
|
66
102
|
|
|
67
103
|
async query(input: QueryInput, timeoutMs?: number): Promise<CliResult> {
|
|
68
|
-
const
|
|
69
|
-
if (!
|
|
104
|
+
const electedToken = this.selectToken();
|
|
105
|
+
if (!electedToken) throw new QuotaError("No tokens available");
|
|
70
106
|
|
|
71
107
|
// await 전에 count 선반영. 병렬 요청이 동시에 도착해도 각자 다른 토큰을 고르도록.
|
|
72
|
-
this.requestCounts.set(
|
|
73
|
-
|
|
74
|
-
logger.info(`→ ${sel.name} (model: ${input.model ?? DEFAULT_MODEL})`);
|
|
75
|
-
|
|
76
|
-
const result = await executeClaude(input, sel.token, timeoutMs ?? DEFAULT_TIMEOUT_MS);
|
|
77
|
-
return { ...result, tokenName: sel.name, model: input.model ?? DEFAULT_MODEL };
|
|
78
|
-
}
|
|
108
|
+
this.requestCounts.set(electedToken.name, this.countOf(electedToken.name) + 1);
|
|
79
109
|
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
110
|
+
let token = electedToken.token;
|
|
111
|
+
// expires_at 임박이면 refresh.
|
|
112
|
+
// refresh 후 DB save → trigger NOTIFY → subscriber 가 받아 캐시 갱신 (다른 dispatcher 도 동기화)
|
|
113
|
+
if (
|
|
114
|
+
electedToken.expires_at &&
|
|
115
|
+
Number(electedToken.expires_at) - Date.now() < REFRESH_SAFETY_MS &&
|
|
116
|
+
electedToken.refresh_token
|
|
117
|
+
) {
|
|
118
|
+
try {
|
|
119
|
+
const { QgridFrame } = await import("./qgrid.frame");
|
|
120
|
+
token = await QgridFrame.refreshToken({
|
|
121
|
+
id: electedToken.id,
|
|
122
|
+
token: electedToken.token,
|
|
123
|
+
name: electedToken.name,
|
|
124
|
+
refresh_token: electedToken.refresh_token,
|
|
125
|
+
});
|
|
126
|
+
} catch (e) {
|
|
127
|
+
logger.warn(`refresh failed for ${electedToken.name}: ${(e as Error).message}`);
|
|
128
|
+
// refresh 실패 시 기존 token 으로 진행. executeClaude 가 401 받으면 caller 처리.
|
|
129
|
+
}
|
|
130
|
+
}
|
|
85
131
|
|
|
86
|
-
|
|
87
|
-
this.tokens.delete(token);
|
|
88
|
-
this.requestCounts.delete(token);
|
|
89
|
-
}
|
|
132
|
+
logger.info(`→ ${electedToken.name} (model: ${input.model ?? DEFAULT_MODEL})`);
|
|
90
133
|
|
|
91
|
-
|
|
92
|
-
return
|
|
134
|
+
const result = await executeClaude(input, token, timeoutMs ?? DEFAULT_TIMEOUT_MS);
|
|
135
|
+
return { ...result, tokenName: electedToken.name, model: input.model ?? DEFAULT_MODEL };
|
|
93
136
|
}
|
|
94
137
|
}
|
|
95
138
|
|
|
@@ -111,11 +154,14 @@ async function executeClaude(
|
|
|
111
154
|
const args: string[] = [
|
|
112
155
|
"-p",
|
|
113
156
|
...toolArgs,
|
|
157
|
+
"--disallowedTools",
|
|
158
|
+
// CC에서 자동 활성화되는 deferred 도구. 토큰 최적화를위해 차단
|
|
159
|
+
...(["Monitor", "PushNotification", "RemoteTrigger"] as const),
|
|
114
160
|
"--output-format",
|
|
115
161
|
"stream-json",
|
|
116
162
|
"--verbose",
|
|
163
|
+
// --max-turns: structured output 은 tool_use + tool_result 로 2턴 소비
|
|
117
164
|
"--max-turns",
|
|
118
|
-
// structured output 은 tool_use + tool_result 로 2턴 소비
|
|
119
165
|
useStructuredOutput ? "2" : "1",
|
|
120
166
|
"--permission-mode",
|
|
121
167
|
"bypassPermissions",
|
|
@@ -123,31 +169,42 @@ async function executeClaude(
|
|
|
123
169
|
"project",
|
|
124
170
|
"--model",
|
|
125
171
|
model,
|
|
126
|
-
//
|
|
127
|
-
"--
|
|
128
|
-
"
|
|
172
|
+
// --system-prompt는 반드시 명시해야함. 옵션 생략 시 CC가 default system prompt를 자동으로 주입함(23k)
|
|
173
|
+
"--system-prompt",
|
|
174
|
+
input.system ?? "",
|
|
175
|
+
"--thinking",
|
|
176
|
+
"disabled",
|
|
177
|
+
"--effort",
|
|
178
|
+
input.effort ?? DEFAULT_EFFORT,
|
|
179
|
+
"--no-session-persistence",
|
|
180
|
+
// 모든 skills 비활성화
|
|
181
|
+
"--disable-slash-commands",
|
|
129
182
|
];
|
|
130
183
|
if (useStructuredOutput) {
|
|
131
184
|
args.push("--json-schema", input.jsonSchema!);
|
|
132
185
|
}
|
|
133
|
-
if (input.system) {
|
|
134
|
-
args.push("--append-system-prompt", input.system);
|
|
135
|
-
}
|
|
136
186
|
args.push(input.prompt);
|
|
137
187
|
|
|
138
188
|
const env: NodeJS.ProcessEnv = {
|
|
139
189
|
PATH: process.env.PATH,
|
|
140
190
|
TMPDIR: process.env.TMPDIR,
|
|
141
191
|
CLAUDE_CODE_OAUTH_TOKEN: token,
|
|
192
|
+
// CLAUDE_CONFIG_DIR 환경변수로 주입
|
|
193
|
+
CLAUDE_CONFIG_DIR,
|
|
142
194
|
CLAUDE_CODE_DISABLE_AUTO_MEMORY: "1",
|
|
143
195
|
CLAUDE_CODE_DISABLE_ADAPTIVE_THINKING: "1",
|
|
144
196
|
CLAUDE_CODE_DISABLE_1M_CONTEXT: "1",
|
|
197
|
+
CLAUDE_CODE_DISABLE_CLAUDE_MDS: "1",
|
|
198
|
+
CLAUDE_CODE_ATTRIBUTION_HEADER: "0",
|
|
145
199
|
};
|
|
146
200
|
|
|
147
201
|
return new Promise<CliResult>((resolve, reject) => {
|
|
148
202
|
const child = spawn("claude", args, {
|
|
149
203
|
stdio: ["ignore", "pipe", "ignore"],
|
|
150
204
|
env,
|
|
205
|
+
// 격리 (두 단계):
|
|
206
|
+
// 1. CLAUDE_CWD — project scope 격리 (cwd 의 .claude/settings.json)
|
|
207
|
+
// 2. CLAUDE_CONFIG_DIR — user scope 격리 cwd 격리만으론 부족.
|
|
151
208
|
cwd: CLAUDE_CWD,
|
|
152
209
|
});
|
|
153
210
|
|
|
@@ -15,6 +15,7 @@ import {
|
|
|
15
15
|
import { QgridDispatcher } from "./qgrid.dispatcher";
|
|
16
16
|
import {
|
|
17
17
|
type CliResult,
|
|
18
|
+
type Effort,
|
|
18
19
|
type HealthResponse,
|
|
19
20
|
type OAuthStartResult,
|
|
20
21
|
type TokenStats,
|
|
@@ -38,8 +39,12 @@ class QgridFrameClass extends BaseFrameClass {
|
|
|
38
39
|
model?: string,
|
|
39
40
|
projectName?: string,
|
|
40
41
|
jsonSchema?: string,
|
|
42
|
+
effort?: Effort,
|
|
41
43
|
): Promise<CliResult> {
|
|
42
|
-
const result = await QgridDispatcher.query(
|
|
44
|
+
const result = await QgridDispatcher.query(
|
|
45
|
+
{ system, prompt, model, jsonSchema, effort },
|
|
46
|
+
timeout,
|
|
47
|
+
);
|
|
43
48
|
|
|
44
49
|
RequestLogModel.save([
|
|
45
50
|
{
|
|
@@ -85,7 +90,6 @@ class QgridFrameClass extends BaseFrameClass {
|
|
|
85
90
|
...(refreshToken && refreshToken.length > 0 ? { refresh_token: refreshToken } : {}),
|
|
86
91
|
},
|
|
87
92
|
]);
|
|
88
|
-
QgridDispatcher.addToken(token, name);
|
|
89
93
|
return { added: true };
|
|
90
94
|
}
|
|
91
95
|
|
|
@@ -109,28 +113,19 @@ class QgridFrameClass extends BaseFrameClass {
|
|
|
109
113
|
...(hasRefreshToken ? { refresh_token: refreshToken } : {}),
|
|
110
114
|
},
|
|
111
115
|
]);
|
|
112
|
-
|
|
113
|
-
if (hasNewToken) {
|
|
114
|
-
QgridDispatcher.removeToken(token);
|
|
115
|
-
QgridDispatcher.addToken(newToken, name ?? entry.name);
|
|
116
|
-
}
|
|
117
116
|
return { updated: true };
|
|
118
117
|
}
|
|
119
118
|
|
|
120
119
|
@api({ httpMethod: "POST", clients: ["axios", "tanstack-mutation"] })
|
|
121
120
|
async removeToken(token: string): Promise<{ removed: boolean }> {
|
|
122
|
-
if (!QgridDispatcher.hasToken(token)) return { removed: false };
|
|
123
|
-
|
|
124
121
|
const entry = await TokenModel.findByToken("A", token);
|
|
125
|
-
if (entry)
|
|
126
|
-
|
|
122
|
+
if (!entry) return { removed: false };
|
|
123
|
+
await TokenModel.del([entry.id]);
|
|
127
124
|
return { removed: true };
|
|
128
125
|
}
|
|
129
126
|
|
|
130
127
|
/**
|
|
131
|
-
*
|
|
132
|
-
* 토큰 활성화/비활성화 토글 (dispatcher 등록/제거 & DB의 active 필드 업데이트)
|
|
133
|
-
* @returns 토큰 활성화 여부
|
|
128
|
+
* 토큰 활성화/비활성화 토글 DB의 active 필드 업데이트
|
|
134
129
|
*/
|
|
135
130
|
@api({ httpMethod: "POST", clients: ["axios", "tanstack-mutation"] })
|
|
136
131
|
async toggleToken(id: number): Promise<{ active: boolean }> {
|
|
@@ -139,13 +134,6 @@ class QgridFrameClass extends BaseFrameClass {
|
|
|
139
134
|
|
|
140
135
|
const newActive = !entry.active;
|
|
141
136
|
await TokenModel.save([{ id, token: entry.token, active: newActive, name: entry.name }]);
|
|
142
|
-
|
|
143
|
-
if (newActive) {
|
|
144
|
-
QgridDispatcher.addToken(entry.token, entry.name);
|
|
145
|
-
} else {
|
|
146
|
-
QgridDispatcher.removeToken(entry.token);
|
|
147
|
-
}
|
|
148
|
-
|
|
149
137
|
return { active: newActive };
|
|
150
138
|
}
|
|
151
139
|
|
|
@@ -181,7 +169,6 @@ class QgridFrameClass extends BaseFrameClass {
|
|
|
181
169
|
if (tokens.accountUuid) {
|
|
182
170
|
const oldEntries = await TokenModel.findByAccountUuid("A", tokens.accountUuid);
|
|
183
171
|
if (oldEntries.length > 0) {
|
|
184
|
-
for (const old of oldEntries) QgridDispatcher.removeToken(old.token);
|
|
185
172
|
await TokenModel.del(oldEntries.map((o) => o.id));
|
|
186
173
|
}
|
|
187
174
|
}
|
|
@@ -195,7 +182,6 @@ class QgridFrameClass extends BaseFrameClass {
|
|
|
195
182
|
account_uuid: tokens.accountUuid,
|
|
196
183
|
},
|
|
197
184
|
]);
|
|
198
|
-
QgridDispatcher.addToken(tokens.accessToken, pending.name);
|
|
199
185
|
|
|
200
186
|
return reply.redirect(`/?oauth=success&name=${encodeURIComponent(pending.name)}`);
|
|
201
187
|
} catch (e) {
|
|
@@ -251,14 +237,16 @@ class QgridFrameClass extends BaseFrameClass {
|
|
|
251
237
|
name: token.name ?? "",
|
|
252
238
|
},
|
|
253
239
|
]);
|
|
254
|
-
QgridDispatcher.removeToken(token.token);
|
|
255
|
-
QgridDispatcher.addToken(refreshed.accessToken, token.name);
|
|
256
240
|
return refreshed.accessToken;
|
|
257
241
|
}
|
|
258
242
|
|
|
259
243
|
@api({ httpMethod: "GET", clients: ["axios", "tanstack-query"] })
|
|
260
244
|
async health(): Promise<HealthResponse> {
|
|
261
|
-
return {
|
|
245
|
+
return {
|
|
246
|
+
status: "ok",
|
|
247
|
+
activeTokens: QgridDispatcher.tokens.size,
|
|
248
|
+
subscriber: QgridDispatcher.subscriber?.status() ?? null,
|
|
249
|
+
};
|
|
262
250
|
}
|
|
263
251
|
}
|
|
264
252
|
|
|
@@ -2,12 +2,16 @@ import { z } from "zod";
|
|
|
2
2
|
|
|
3
3
|
// ─── Query ───
|
|
4
4
|
|
|
5
|
+
export const Effort = z.enum(["low", "medium", "high"]);
|
|
6
|
+
export type Effort = z.infer<typeof Effort>;
|
|
7
|
+
|
|
5
8
|
export const QueryInput = z.object({
|
|
6
9
|
system: z.string().optional(),
|
|
7
10
|
prompt: z.string(),
|
|
8
11
|
model: z.string().optional(),
|
|
9
12
|
timeout: z.number().optional(),
|
|
10
13
|
jsonSchema: z.string().optional(),
|
|
14
|
+
effort: Effort.optional(),
|
|
11
15
|
});
|
|
12
16
|
export type QueryInput = z.infer<typeof QueryInput>;
|
|
13
17
|
|
|
@@ -82,9 +86,18 @@ export type UsageResponse = z.infer<typeof UsageResponse>;
|
|
|
82
86
|
|
|
83
87
|
// ─── Health ───
|
|
84
88
|
|
|
89
|
+
export const SubscriberStatus = z.object({
|
|
90
|
+
connected: z.boolean(),
|
|
91
|
+
connectedAt: z.date().nullable(),
|
|
92
|
+
lastReconcileAt: z.date().nullable(),
|
|
93
|
+
attempt: z.number(),
|
|
94
|
+
});
|
|
95
|
+
export type SubscriberStatus = z.infer<typeof SubscriberStatus>;
|
|
96
|
+
|
|
85
97
|
export const HealthResponse = z.object({
|
|
86
98
|
status: z.string(),
|
|
87
99
|
activeTokens: z.number(),
|
|
100
|
+
subscriber: SubscriberStatus.nullable(),
|
|
88
101
|
});
|
|
89
102
|
export type HealthResponse = z.infer<typeof HealthResponse>;
|
|
90
103
|
|