github-issue-tower-defence-management 1.149.0 → 1.150.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/CHANGELOG.md +14 -0
- package/README.md +1 -1
- package/bin/adapter/entry-points/handlers/LiveSessionOauthTokenSelectHandler.js +2 -2
- package/bin/adapter/entry-points/handlers/LiveSessionOauthTokenSelectHandler.js.map +1 -1
- package/bin/adapter/entry-points/handlers/OauthTokenSelectHandler.js +1 -1
- package/bin/adapter/entry-points/handlers/OauthTokenSelectHandler.js.map +1 -1
- package/bin/domain/usecases/DailySecurityScanUseCase.js +17 -12
- package/bin/domain/usecases/DailySecurityScanUseCase.js.map +1 -1
- package/bin/domain/usecases/LiveSessionOauthTokenSelectUseCase.js +1 -0
- package/bin/domain/usecases/LiveSessionOauthTokenSelectUseCase.js.map +1 -1
- package/bin/domain/usecases/OauthTokenSelectUseCase.js +15 -7
- package/bin/domain/usecases/OauthTokenSelectUseCase.js.map +1 -1
- package/package.json +1 -1
- package/src/adapter/entry-points/handlers/LiveSessionOauthTokenSelectHandler.test.ts +21 -0
- package/src/adapter/entry-points/handlers/LiveSessionOauthTokenSelectHandler.ts +6 -6
- package/src/adapter/entry-points/handlers/OauthTokenSelectHandler.test.ts +27 -0
- package/src/adapter/entry-points/handlers/OauthTokenSelectHandler.ts +5 -5
- package/src/domain/usecases/DailySecurityScanUseCase.test.ts +251 -0
- package/src/domain/usecases/DailySecurityScanUseCase.ts +28 -22
- package/src/domain/usecases/LiveSessionOauthTokenSelectUseCase.test.ts +33 -0
- package/src/domain/usecases/LiveSessionOauthTokenSelectUseCase.ts +4 -2
- package/src/domain/usecases/OauthTokenSelectUseCase.test.ts +88 -0
- package/src/domain/usecases/OauthTokenSelectUseCase.ts +21 -13
- package/types/adapter/entry-points/handlers/LiveSessionOauthTokenSelectHandler.d.ts +2 -2
- package/types/adapter/entry-points/handlers/LiveSessionOauthTokenSelectHandler.d.ts.map +1 -1
- package/types/adapter/entry-points/handlers/OauthTokenSelectHandler.d.ts +1 -1
- package/types/adapter/entry-points/handlers/OauthTokenSelectHandler.d.ts.map +1 -1
- package/types/domain/usecases/DailySecurityScanUseCase.d.ts.map +1 -1
- package/types/domain/usecases/LiveSessionOauthTokenSelectUseCase.d.ts +3 -2
- package/types/domain/usecases/LiveSessionOauthTokenSelectUseCase.d.ts.map +1 -1
- package/types/domain/usecases/OauthTokenSelectUseCase.d.ts +1 -0
- package/types/domain/usecases/OauthTokenSelectUseCase.d.ts.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
# [1.150.0](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/compare/v1.149.1...v1.150.0) (2026-08-13)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* **OauthTokenSelectUseCase:** expose selection weight in per-candidate metrics and decision trace ([#1521](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/issues/1521)) ([11a6ace](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/commit/11a6ace36cf17d93e126825ef4e9b69f8d792de4)), closes [#1417](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/issues/1417)
|
|
7
|
+
|
|
8
|
+
## [1.149.1](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/compare/v1.149.0...v1.149.1) (2026-08-13)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* **DailySecurityScanUseCase:** keep scanning after a repository's findings issue write fails ([#1519](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/issues/1519)) ([49d06db](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/commit/49d06db8e110223f71c28a53e315bec7437a2a53))
|
|
14
|
+
|
|
1
15
|
# [1.149.0](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/compare/v1.148.25...v1.149.0) (2026-08-13)
|
|
2
16
|
|
|
3
17
|
|
package/README.md
CHANGED
|
@@ -218,7 +218,7 @@ claudeCodeOauthTokenListJsonPath?: string # Optional: Path to a JSON file listin
|
|
|
218
218
|
autoAssignManagerAuthors?: string | string[] | null # Optional: Restrict which authors' open, unassigned issues and pull requests are auto-assigned to the manager. Accepts a comma-separated string or an array of GitHub author logins (bot logins carry the `[bot]` suffix, for example `renovate[bot]`). When set to a non-empty list, only items whose author is in the list are auto-assigned; when omitted, null, or empty, every open unassigned item is auto-assigned (current behavior). Author matching is exact equality. Declared at the top level (sibling of startPreparation), not inside it.
|
|
219
219
|
queryToAddProjectEnabled?: boolean # Optional: Enable the queryToAddProject search (default false). The search runs only when this is true, so setting queryToAddProject alone changes nothing. Declared at the top level (sibling of startPreparation), not inside it.
|
|
220
220
|
queryToAddProject?: string | null # Optional: GitHub search query string, used only when queryToAddProjectEnabled is true. Each schedule cycle, issues and pull requests matching this query that are not already on the project board are added to the project and, when their author satisfies autoAssignManagerAuthors, assigned to the manager. Omit or set to null to skip this search. Declared at the top level (sibling of startPreparation), not inside it.
|
|
221
|
-
dailySecurityScan?: # Optional: Run a daily OSV-Scanner security scan across locally cloned repositories of the org. Declared at the top level (sibling of startPreparation).
|
|
221
|
+
dailySecurityScan?: # Optional: Run a daily OSV-Scanner security scan across locally cloned repositories of the org. Declared at the top level (sibling of startPreparation). When the findings of one repository cannot be written to GitHub — for example because that repository is archived and therefore read-only, or because the rendered findings exceed what the issues API accepts — the failure is logged with the repository name and the cause, that repository is skipped, and the remaining repositories are still scanned and the CISA KEV report still runs.
|
|
222
222
|
scanBaseDirectory: string # Base directory searched (4 levels deep) for cloned repositories to scan
|
|
223
223
|
targetHourUtc: number # UTC hour (0-23) at which the scan runs once per day; the scan runs only when a target date matches this hour at minute zero
|
|
224
224
|
enableKevNvdReport?: boolean # Optional: When true, also report CISA KEV catalog additions that have not been reported yet. A watermark recording the newest reported dateAdded, plus the CVE identifiers already reported on that date, is persisted at $XDG_CACHE_HOME/tdpm/kev-report-watermark.json (falling back to ~/.cache when XDG_CACHE_HOME is unset) and advanced over every addition the run considered, whether or not that addition matched a package the scan actually found and therefore produced a report issue. Only an addition whose CVE identifier matches a package the scan found at an installed version is written into the report issue. On the first run, when no watermark is stored yet, the additions dated on or after the day before the run are considered. Known limitations: (1) if the watermark write fails after the report issue was created, the failure is logged with the state file path and the cause, the run continues so that unrelated scheduled work is not aborted, and the same additions are considered again on the next run, so the guarantee is at-least-once at that boundary rather than exactly-once; (2) an addition whose dateAdded is strictly earlier than the stored watermark date, whether back-dated or published very late, is never selected again, so the protection covers late additions on the watermark date itself and not arbitrary lateness. When the stored watermark file exists but cannot be read or is malformed (including a stored date that is not a real calendar date in YYYY-MM-DD form), the KEV report is skipped for that run, an error naming the file and the cause is logged, the file is left untouched for inspection, and the rest of the scheduled work continues
|
|
@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.LiveSessionOauthTokenSelectHandler = void 0;
|
|
4
4
|
const LiveSessionOauthTokenSelectUseCase_1 = require("../../../domain/usecases/LiveSessionOauthTokenSelectUseCase");
|
|
5
5
|
const OauthTokenSelectUseCase_1 = require("../../../domain/usecases/OauthTokenSelectUseCase");
|
|
6
|
-
const ProcClaudeLiveSessionRepository_1 = require("../../repositories/ProcClaudeLiveSessionRepository");
|
|
7
6
|
const RateLimitCache_1 = require("../../proxy/RateLimitCache");
|
|
8
7
|
const TokenListLoader_1 = require("../../proxy/TokenListLoader");
|
|
8
|
+
const ProcClaudeLiveSessionRepository_1 = require("../../repositories/ProcClaudeLiveSessionRepository");
|
|
9
9
|
const OauthTokenSelectHandler_1 = require("./OauthTokenSelectHandler");
|
|
10
10
|
class LiveSessionOauthTokenSelectHandler {
|
|
11
11
|
constructor(useCase = new LiveSessionOauthTokenSelectUseCase_1.LiveSessionOauthTokenSelectUseCase(), liveSessionRepository = new ProcClaudeLiveSessionRepository_1.ProcClaudeLiveSessionRepository()) {
|
|
@@ -70,7 +70,7 @@ class LiveSessionOauthTokenSelectHandler {
|
|
|
70
70
|
const status = metric.eligible
|
|
71
71
|
? 'eligible'
|
|
72
72
|
: `excluded (${metric.exclusionReason})`;
|
|
73
|
-
return `${metric.name}: ${metric.liveSessionCount}/${metric.concurrentSessionLimit} live session(s), 5h ${Math.round(metric.fiveHourFreeRatio * 100)}% free, 7d ${Math.round(metric.sevenDayFreeRatio * 100)}% free, 7d-end in ${secondsUntilSevenDayEnd}s -> ${status}`;
|
|
73
|
+
return `${metric.name}: ${metric.liveSessionCount}/${metric.concurrentSessionLimit} live session(s), 5h ${Math.round(metric.fiveHourFreeRatio * 100)}% free, 7d ${Math.round(metric.sevenDayFreeRatio * 100)}% free, 7d-end in ${secondsUntilSevenDayEnd}s, weight ${metric.selectionWeight} -> ${status}`;
|
|
74
74
|
});
|
|
75
75
|
if (result.selected === null) {
|
|
76
76
|
lines.push(`No eligible token: every token is below the 5h >= ${Math.round(OauthTokenSelectUseCase_1.FIVE_HOUR_MIN_FREE_RATIO * 100)}% free and 7d >= ${Math.round(OauthTokenSelectUseCase_1.SEVEN_DAY_MIN_FREE_RATIO * 100)}% free thresholds required to start a live session.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LiveSessionOauthTokenSelectHandler.js","sourceRoot":"","sources":["../../../../src/adapter/entry-points/handlers/LiveSessionOauthTokenSelectHandler.ts"],"names":[],"mappings":";;;AACA,oHAIqE;AACrE,8FAK0D;AAC1D
|
|
1
|
+
{"version":3,"file":"LiveSessionOauthTokenSelectHandler.js","sourceRoot":"","sources":["../../../../src/adapter/entry-points/handlers/LiveSessionOauthTokenSelectHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -90,7 +90,7 @@ class OauthTokenSelectHandler {
|
|
|
90
90
|
const status = metric.eligible
|
|
91
91
|
? 'eligible'
|
|
92
92
|
: `excluded (${metric.exclusionReason})`;
|
|
93
|
-
return `${metric.name}: 5h ${Math.round(metric.fiveHourFreeRatio * 100)}% free, 7d ${Math.round(metric.sevenDayFreeRatio * 100)}% free, 7d-end in ${secondsUntilSevenDayEnd}s -> ${status}`;
|
|
93
|
+
return `${metric.name}: 5h ${Math.round(metric.fiveHourFreeRatio * 100)}% free, 7d ${Math.round(metric.sevenDayFreeRatio * 100)}% free, 7d-end in ${secondsUntilSevenDayEnd}s, draw weight ${metric.drawWeight.toFixed(2)} -> ${status}`;
|
|
94
94
|
});
|
|
95
95
|
if (result.selected === null) {
|
|
96
96
|
lines.push('No eligible token passed the rate-limit filter.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OauthTokenSelectHandler.js","sourceRoot":"","sources":["../../../../src/adapter/entry-points/handlers/OauthTokenSelectHandler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"OauthTokenSelectHandler.js","sourceRoot":"","sources":["../../../../src/adapter/entry-points/handlers/OauthTokenSelectHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -170,19 +170,24 @@ class DailySecurityScanUseCase {
|
|
|
170
170
|
const vulnerablePackages = parseScannerVulnerabilities(repositoryName, scanOutput);
|
|
171
171
|
scannedVulnerablePackages.push(...vulnerablePackages);
|
|
172
172
|
const findingsBody = renderScannerFindings(today, vulnerablePackages);
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
173
|
+
try {
|
|
174
|
+
const existingIssues = await this.issueRepository.searchIssue({
|
|
175
|
+
owner: repositoryOrg,
|
|
176
|
+
repositoryName,
|
|
177
|
+
type: 'issue',
|
|
178
|
+
state: 'open',
|
|
179
|
+
title: 'Daily security scan findings',
|
|
180
|
+
});
|
|
181
|
+
const existingIssue = existingIssues.find((issue) => issue.title === 'Daily security scan findings');
|
|
182
|
+
if (existingIssue) {
|
|
183
|
+
await this.issueRepository.createCommentByUrl(existingIssue.url, findingsBody);
|
|
184
|
+
}
|
|
185
|
+
else {
|
|
186
|
+
await this.issueRepository.createNewIssue(repositoryOrg, repositoryName, 'Daily security scan findings', findingsBody, [manager], []);
|
|
187
|
+
}
|
|
183
188
|
}
|
|
184
|
-
|
|
185
|
-
|
|
189
|
+
catch (error) {
|
|
190
|
+
console.error(`The findings of ${repositoryOrg}/${repositoryName} were not written to GitHub: ${String(error)}. The remaining repositories are still scanned and the CISA KEV report still runs.`);
|
|
186
191
|
}
|
|
187
192
|
}
|
|
188
193
|
return scannedVulnerablePackages;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DailySecurityScanUseCase.js","sourceRoot":"","sources":["../../../src/domain/usecases/DailySecurityScanUseCase.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"DailySecurityScanUseCase.js","sourceRoot":"","sources":["../../../src/domain/usecases/DailySecurityScanUseCase.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,6 +35,7 @@ class LiveSessionOauthTokenSelectUseCase {
|
|
|
35
35
|
hasConcurrencyHeadroom: liveSessionCount < concurrentSessionLimit,
|
|
36
36
|
eligible: rateLimitMetric.eligible,
|
|
37
37
|
exclusionReason: rateLimitMetric.exclusionReason,
|
|
38
|
+
selectionWeight: (0, OauthTokenSelectUseCase_1.selectionWeightOf)(candidate),
|
|
38
39
|
},
|
|
39
40
|
};
|
|
40
41
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LiveSessionOauthTokenSelectUseCase.js","sourceRoot":"","sources":["../../../src/domain/usecases/LiveSessionOauthTokenSelectUseCase.ts"],"names":[],"mappings":";;;AACA,uEAImC;AAOtB,QAAA,mDAAmD,GAC9D;IACE,yBAAyB,EAAE,EAAE;IAC7B,0BAA0B,EAAE,GAAG;CAChC,CAAC;AAEG,MAAM,4BAA4B,GAAG,CAC1C,iBAAyB,EACzB,eAAuB,EACvB,QAAgD,EACxC,EAAE;IACV,MAAM,sBAAsB,GAAG,IAAI,CAAC,GAAG,CACrC,iBAAiB,GAAG,QAAQ,CAAC,0BAA0B,EACvD,CAAC,CACF,CAAC;IACF,OAAO,IAAI,CAAC,GAAG,CACb,IAAI,CAAC,KAAK,CACR,QAAQ,CAAC,yBAAyB;QAChC,eAAe;QACf,sBAAsB,CACzB,EACD,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,4BAA4B,gCAiBvC;
|
|
1
|
+
{"version":3,"file":"LiveSessionOauthTokenSelectUseCase.js","sourceRoot":"","sources":["../../../src/domain/usecases/LiveSessionOauthTokenSelectUseCase.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,20 +42,28 @@ exports.selectWeightedCandidate = selectWeightedCandidate;
|
|
|
42
42
|
class OauthTokenSelectUseCase {
|
|
43
43
|
constructor() {
|
|
44
44
|
this.run = (candidates, nowEpochSeconds, random = Math.random) => {
|
|
45
|
-
const evaluated = candidates.map((candidate) =>
|
|
46
|
-
candidate,
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
45
|
+
const evaluated = candidates.map((candidate) => {
|
|
46
|
+
const evaluatedMetric = this.evaluate(candidate, nowEpochSeconds);
|
|
47
|
+
return {
|
|
48
|
+
candidate,
|
|
49
|
+
metric: {
|
|
50
|
+
...evaluatedMetric,
|
|
51
|
+
drawWeight: evaluatedMetric.eligible
|
|
52
|
+
? (0, exports.selectionWeightOf)(candidate) *
|
|
53
|
+
(0, exports.sevenDayUrgencyFactor)(evaluatedMetric.sevenDayFreeRatio, evaluatedMetric.sevenDayEndEpoch, nowEpochSeconds)
|
|
54
|
+
: 0,
|
|
55
|
+
},
|
|
56
|
+
};
|
|
57
|
+
});
|
|
50
58
|
const eligible = evaluated.filter((entry) => entry.metric.eligible);
|
|
59
|
+
const metrics = evaluated.map((entry) => entry.metric);
|
|
51
60
|
if (eligible.length === 0) {
|
|
52
61
|
return { selected: null, metrics };
|
|
53
62
|
}
|
|
54
63
|
const deterministicBest = eligible.reduce((bestEntry, currentEntry) => currentEntry.metric.sevenDayEndEpoch < bestEntry.metric.sevenDayEndEpoch
|
|
55
64
|
? currentEntry
|
|
56
65
|
: bestEntry);
|
|
57
|
-
const selected = (0, exports.selectWeightedCandidate)(eligible, (entry) =>
|
|
58
|
-
(0, exports.sevenDayUrgencyFactor)(entry.metric.sevenDayFreeRatio, entry.metric.sevenDayEndEpoch, nowEpochSeconds), deterministicBest, random);
|
|
66
|
+
const selected = (0, exports.selectWeightedCandidate)(eligible, (entry) => entry.metric.drawWeight, deterministicBest, random);
|
|
59
67
|
return { selected: selected.candidate, metrics };
|
|
60
68
|
};
|
|
61
69
|
this.evaluate = (candidate, nowEpochSeconds) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OauthTokenSelectUseCase.js","sourceRoot":"","sources":["../../../src/domain/usecases/OauthTokenSelectUseCase.ts"],"names":[],"mappings":";;;AAmBa,QAAA,wBAAwB,GAAG,CAAC,CAAC;AAEnC,MAAM,iBAAiB,GAAG,CAAC,SAA8B,EAAU,EAAE;IAC1E,MAAM,MAAM,GAAG,SAAS,CAAC,eAAe,IAAI,gCAAwB,CAAC;IACrE,OAAO,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AACjC,CAAC,CAAC;AAHW,QAAA,iBAAiB,qBAG5B;
|
|
1
|
+
{"version":3,"file":"OauthTokenSelectUseCase.js","sourceRoot":"","sources":["../../../src/domain/usecases/OauthTokenSelectUseCase.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -347,6 +347,27 @@ describe('LiveSessionOauthTokenSelectHandler', () => {
|
|
|
347
347
|
expect(output.diagnostics.join('\n')).not.toContain('No eligible token');
|
|
348
348
|
});
|
|
349
349
|
|
|
350
|
+
it('includes the selection weight in the diagnostic line for each candidate', () => {
|
|
351
|
+
writeTokenList([{ name: 'foo', token: 'fake-foo' }]);
|
|
352
|
+
writeCache('fake-foo', {
|
|
353
|
+
fiveHourUtilization: 0.1,
|
|
354
|
+
fiveHourReset: NOW + HOUR,
|
|
355
|
+
sevenDayUtilization: 0.1,
|
|
356
|
+
sevenDayReset: NOW + DAY,
|
|
357
|
+
});
|
|
358
|
+
|
|
359
|
+
const handler = buildHandler([]);
|
|
360
|
+
const output = handler.handle({
|
|
361
|
+
tokenListJsonPath: tokenListPath,
|
|
362
|
+
cacheDirectory,
|
|
363
|
+
nowEpochSeconds: NOW,
|
|
364
|
+
selectionSettings: DEFAULT_LIVE_SESSION_OAUTH_TOKEN_SELECTION_SETTINGS,
|
|
365
|
+
});
|
|
366
|
+
|
|
367
|
+
const diagnostics = output.diagnostics.join('\n');
|
|
368
|
+
expect(diagnostics).toMatch(/foo:.*, weight 1 ->/);
|
|
369
|
+
});
|
|
370
|
+
|
|
350
371
|
it('returns a diagnostic when no token list path is resolvable', () => {
|
|
351
372
|
const handler = buildHandler([]);
|
|
352
373
|
const output = handler.handle({
|
|
@@ -1,18 +1,18 @@
|
|
|
1
|
-
import { ClaudeLiveSessionRepository } from '../../../domain/usecases/adapter-interfaces/ClaudeLiveSessionRepository';
|
|
1
|
+
import type { ClaudeLiveSessionRepository } from '../../../domain/usecases/adapter-interfaces/ClaudeLiveSessionRepository';
|
|
2
2
|
import {
|
|
3
|
-
|
|
3
|
+
type LiveSessionOauthTokenSelectionSettings,
|
|
4
|
+
type LiveSessionOauthTokenSelectResult,
|
|
4
5
|
LiveSessionOauthTokenSelectUseCase,
|
|
5
|
-
LiveSessionOauthTokenSelectionSettings,
|
|
6
6
|
} from '../../../domain/usecases/LiveSessionOauthTokenSelectUseCase';
|
|
7
7
|
import {
|
|
8
8
|
DEFAULT_SELECTION_WEIGHT,
|
|
9
9
|
FIVE_HOUR_MIN_FREE_RATIO,
|
|
10
|
-
OauthTokenCandidate,
|
|
10
|
+
type OauthTokenCandidate,
|
|
11
11
|
SEVEN_DAY_MIN_FREE_RATIO,
|
|
12
12
|
} from '../../../domain/usecases/OauthTokenSelectUseCase';
|
|
13
|
-
import { ProcClaudeLiveSessionRepository } from '../../repositories/ProcClaudeLiveSessionRepository';
|
|
14
13
|
import { FABLE_LIMIT_TYPE, readRateLimit } from '../../proxy/RateLimitCache';
|
|
15
14
|
import { loadTokenEntries } from '../../proxy/TokenListLoader';
|
|
15
|
+
import { ProcClaudeLiveSessionRepository } from '../../repositories/ProcClaudeLiveSessionRepository';
|
|
16
16
|
import {
|
|
17
17
|
resolveCacheDirectory,
|
|
18
18
|
resolveTokenListJsonPath,
|
|
@@ -119,7 +119,7 @@ export class LiveSessionOauthTokenSelectHandler {
|
|
|
119
119
|
const status = metric.eligible
|
|
120
120
|
? 'eligible'
|
|
121
121
|
: `excluded (${metric.exclusionReason})`;
|
|
122
|
-
return `${metric.name}: ${metric.liveSessionCount}/${metric.concurrentSessionLimit} live session(s), 5h ${Math.round(metric.fiveHourFreeRatio * 100)}% free, 7d ${Math.round(metric.sevenDayFreeRatio * 100)}% free, 7d-end in ${secondsUntilSevenDayEnd}s -> ${status}`;
|
|
122
|
+
return `${metric.name}: ${metric.liveSessionCount}/${metric.concurrentSessionLimit} live session(s), 5h ${Math.round(metric.fiveHourFreeRatio * 100)}% free, 7d ${Math.round(metric.sevenDayFreeRatio * 100)}% free, 7d-end in ${secondsUntilSevenDayEnd}s, weight ${metric.selectionWeight} -> ${status}`;
|
|
123
123
|
});
|
|
124
124
|
|
|
125
125
|
if (result.selected === null) {
|
|
@@ -367,6 +367,33 @@ describe('OauthTokenSelectHandler', () => {
|
|
|
367
367
|
expect(output.selectedName).toBeNull();
|
|
368
368
|
});
|
|
369
369
|
|
|
370
|
+
it('includes the draw weight in the diagnostic line for each candidate', () => {
|
|
371
|
+
writeTokenList([{ name: 'foo', token: 'fake-foo' }]);
|
|
372
|
+
writeCache('fake-foo', {
|
|
373
|
+
fiveHourUtilization: 0.1,
|
|
374
|
+
fiveHourReset: NOW + HOUR,
|
|
375
|
+
sevenDayUtilization: 0.1,
|
|
376
|
+
sevenDayReset: NOW + 2 * DAY,
|
|
377
|
+
});
|
|
378
|
+
|
|
379
|
+
const handler = new OauthTokenSelectHandler(
|
|
380
|
+
new OauthTokenSelectUseCase(),
|
|
381
|
+
() => 0.5,
|
|
382
|
+
);
|
|
383
|
+
const output = handler.handle({
|
|
384
|
+
tokenListJsonPath: tokenListPath,
|
|
385
|
+
cacheDirectory,
|
|
386
|
+
nowEpochSeconds: NOW,
|
|
387
|
+
});
|
|
388
|
+
|
|
389
|
+
const diagnostics = output.diagnostics.join('\n');
|
|
390
|
+
const drawWeightMatch = /foo:.*draw weight (\d+\.\d{2}) ->/.exec(
|
|
391
|
+
diagnostics,
|
|
392
|
+
);
|
|
393
|
+
expect(drawWeightMatch).not.toBeNull();
|
|
394
|
+
expect(Number(drawWeightMatch?.[1])).toBeGreaterThan(0);
|
|
395
|
+
});
|
|
396
|
+
|
|
370
397
|
describe('resolveTokenListJsonPath', () => {
|
|
371
398
|
it('prefers the explicit path over the environment variable', () => {
|
|
372
399
|
process.env.CLAUDE_CODE_OAUTH_TOKEN_LIST_JSON_PATH = '/from/env.json';
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import {
|
|
2
2
|
DEFAULT_SELECTION_WEIGHT,
|
|
3
|
-
OauthTokenCandidate,
|
|
4
|
-
OauthTokenSelectResult,
|
|
3
|
+
type OauthTokenCandidate,
|
|
4
|
+
type OauthTokenSelectResult,
|
|
5
5
|
OauthTokenSelectUseCase,
|
|
6
|
-
SelectionRandom,
|
|
6
|
+
type SelectionRandom,
|
|
7
7
|
} from '../../../domain/usecases/OauthTokenSelectUseCase';
|
|
8
8
|
import {
|
|
9
|
-
FABLE_LIMIT_TYPE,
|
|
10
9
|
cacheDir,
|
|
10
|
+
FABLE_LIMIT_TYPE,
|
|
11
11
|
readRateLimit,
|
|
12
12
|
} from '../../proxy/RateLimitCache';
|
|
13
13
|
import { loadTokenEntries } from '../../proxy/TokenListLoader';
|
|
@@ -138,7 +138,7 @@ export class OauthTokenSelectHandler {
|
|
|
138
138
|
const status = metric.eligible
|
|
139
139
|
? 'eligible'
|
|
140
140
|
: `excluded (${metric.exclusionReason})`;
|
|
141
|
-
return `${metric.name}: 5h ${Math.round(metric.fiveHourFreeRatio * 100)}% free, 7d ${Math.round(metric.sevenDayFreeRatio * 100)}% free, 7d-end in ${secondsUntilSevenDayEnd}s -> ${status}`;
|
|
141
|
+
return `${metric.name}: 5h ${Math.round(metric.fiveHourFreeRatio * 100)}% free, 7d ${Math.round(metric.sevenDayFreeRatio * 100)}% free, 7d-end in ${secondsUntilSevenDayEnd}s, draw weight ${metric.drawWeight.toFixed(2)} -> ${status}`;
|
|
142
142
|
});
|
|
143
143
|
|
|
144
144
|
if (result.selected === null) {
|
|
@@ -909,6 +909,210 @@ describe('DailySecurityScanUseCase', () => {
|
|
|
909
909
|
errorSpy.mockRestore();
|
|
910
910
|
});
|
|
911
911
|
|
|
912
|
+
it('logs an error and continues scanning remaining repositories when creating the findings issue fails', async () => {
|
|
913
|
+
const { useCase, mockLocalCommandRunner, mockIssueRepository } =
|
|
914
|
+
buildUseCase();
|
|
915
|
+
const errorSpy = jest
|
|
916
|
+
.spyOn(console, 'error')
|
|
917
|
+
.mockImplementation(() => undefined);
|
|
918
|
+
|
|
919
|
+
mockIssueRepository.searchIssue.mockResolvedValue([]);
|
|
920
|
+
mockIssueRepository.createNewIssue.mockImplementation(
|
|
921
|
+
async (_org, repositoryName) => {
|
|
922
|
+
if (repositoryName === 'archived') {
|
|
923
|
+
throw new Error(
|
|
924
|
+
'Request failed with status code 403: Repository was archived so is read-only.',
|
|
925
|
+
);
|
|
926
|
+
}
|
|
927
|
+
return 1;
|
|
928
|
+
},
|
|
929
|
+
);
|
|
930
|
+
|
|
931
|
+
mockLocalCommandRunner.runCommand.mockImplementation(
|
|
932
|
+
async (program, args) => {
|
|
933
|
+
if (program === 'find') {
|
|
934
|
+
return {
|
|
935
|
+
stdout:
|
|
936
|
+
'/repos/example-org/archived/.git\n/repos/example-org/app/.git\n',
|
|
937
|
+
stderr: '',
|
|
938
|
+
exitCode: 0,
|
|
939
|
+
};
|
|
940
|
+
}
|
|
941
|
+
if (program === 'mktemp') {
|
|
942
|
+
return {
|
|
943
|
+
stdout: `/tmp/${args[args.length - 1].replace('XXXXXX', 'abc123')}\n`,
|
|
944
|
+
stderr: '',
|
|
945
|
+
exitCode: 0,
|
|
946
|
+
};
|
|
947
|
+
}
|
|
948
|
+
if (program === 'git') {
|
|
949
|
+
const dir = args[1];
|
|
950
|
+
const repo = dir.split('/').pop() ?? '';
|
|
951
|
+
return {
|
|
952
|
+
stdout: `git@github.com:example-org/${repo}.git\n`,
|
|
953
|
+
stderr: '',
|
|
954
|
+
exitCode: 0,
|
|
955
|
+
};
|
|
956
|
+
}
|
|
957
|
+
if (program === 'osv-scanner') {
|
|
958
|
+
return {
|
|
959
|
+
stdout: JSON.stringify({
|
|
960
|
+
results: [
|
|
961
|
+
{
|
|
962
|
+
source: {
|
|
963
|
+
path: args[args.indexOf('-r') + 1],
|
|
964
|
+
type: 'lockfile',
|
|
965
|
+
},
|
|
966
|
+
packages: [
|
|
967
|
+
{
|
|
968
|
+
package: {
|
|
969
|
+
name: 'example-library',
|
|
970
|
+
version: '1.2.3',
|
|
971
|
+
ecosystem: 'npm',
|
|
972
|
+
},
|
|
973
|
+
vulnerabilities: [
|
|
974
|
+
{
|
|
975
|
+
id: 'GHSA-1111-2222-3333',
|
|
976
|
+
aliases: [],
|
|
977
|
+
summary: 'Example Library Deserialization',
|
|
978
|
+
},
|
|
979
|
+
],
|
|
980
|
+
},
|
|
981
|
+
],
|
|
982
|
+
},
|
|
983
|
+
],
|
|
984
|
+
}),
|
|
985
|
+
stderr: '',
|
|
986
|
+
exitCode: 1,
|
|
987
|
+
};
|
|
988
|
+
}
|
|
989
|
+
return { stdout: '', stderr: '', exitCode: 0 };
|
|
990
|
+
},
|
|
991
|
+
);
|
|
992
|
+
|
|
993
|
+
await useCase.run({
|
|
994
|
+
targetDates: [new Date('2024-01-02T05:00:00Z')],
|
|
995
|
+
org: 'example-org',
|
|
996
|
+
manager: 'manager-name',
|
|
997
|
+
dailySecurityScan: {
|
|
998
|
+
scanBaseDirectory: '/repos',
|
|
999
|
+
targetHourUtc: 5,
|
|
1000
|
+
},
|
|
1001
|
+
});
|
|
1002
|
+
|
|
1003
|
+
expect(errorSpy).toHaveBeenCalledWith(
|
|
1004
|
+
expect.stringContaining('archived'),
|
|
1005
|
+
);
|
|
1006
|
+
expect(
|
|
1007
|
+
mockIssueRepository.createNewIssue.mock.calls.map((call) => call[1]),
|
|
1008
|
+
).toEqual(['archived', 'app']);
|
|
1009
|
+
errorSpy.mockRestore();
|
|
1010
|
+
});
|
|
1011
|
+
|
|
1012
|
+
it('logs an error and continues scanning remaining repositories when commenting on the existing findings issue fails', async () => {
|
|
1013
|
+
const { useCase, mockLocalCommandRunner, mockIssueRepository } =
|
|
1014
|
+
buildUseCase();
|
|
1015
|
+
const errorSpy = jest
|
|
1016
|
+
.spyOn(console, 'error')
|
|
1017
|
+
.mockImplementation(() => undefined);
|
|
1018
|
+
|
|
1019
|
+
mockIssueRepository.searchIssue.mockImplementation(
|
|
1020
|
+
async ({ repositoryName }) =>
|
|
1021
|
+
repositoryName === 'oversized'
|
|
1022
|
+
? [
|
|
1023
|
+
{
|
|
1024
|
+
url: 'https://github.com/example-org/oversized/issues/1',
|
|
1025
|
+
title: 'Daily security scan findings',
|
|
1026
|
+
number: '1',
|
|
1027
|
+
},
|
|
1028
|
+
]
|
|
1029
|
+
: [],
|
|
1030
|
+
);
|
|
1031
|
+
mockIssueRepository.createCommentByUrl.mockRejectedValue(
|
|
1032
|
+
new Error('Request failed with status code 422: Validation Failed'),
|
|
1033
|
+
);
|
|
1034
|
+
|
|
1035
|
+
mockLocalCommandRunner.runCommand.mockImplementation(
|
|
1036
|
+
async (program, args) => {
|
|
1037
|
+
if (program === 'find') {
|
|
1038
|
+
return {
|
|
1039
|
+
stdout:
|
|
1040
|
+
'/repos/example-org/oversized/.git\n/repos/example-org/app/.git\n',
|
|
1041
|
+
stderr: '',
|
|
1042
|
+
exitCode: 0,
|
|
1043
|
+
};
|
|
1044
|
+
}
|
|
1045
|
+
if (program === 'mktemp') {
|
|
1046
|
+
return {
|
|
1047
|
+
stdout: `/tmp/${args[args.length - 1].replace('XXXXXX', 'abc123')}\n`,
|
|
1048
|
+
stderr: '',
|
|
1049
|
+
exitCode: 0,
|
|
1050
|
+
};
|
|
1051
|
+
}
|
|
1052
|
+
if (program === 'git') {
|
|
1053
|
+
const dir = args[1];
|
|
1054
|
+
const repo = dir.split('/').pop() ?? '';
|
|
1055
|
+
return {
|
|
1056
|
+
stdout: `git@github.com:example-org/${repo}.git\n`,
|
|
1057
|
+
stderr: '',
|
|
1058
|
+
exitCode: 0,
|
|
1059
|
+
};
|
|
1060
|
+
}
|
|
1061
|
+
if (program === 'osv-scanner') {
|
|
1062
|
+
return {
|
|
1063
|
+
stdout: JSON.stringify({
|
|
1064
|
+
results: [
|
|
1065
|
+
{
|
|
1066
|
+
source: {
|
|
1067
|
+
path: args[args.indexOf('-r') + 1],
|
|
1068
|
+
type: 'lockfile',
|
|
1069
|
+
},
|
|
1070
|
+
packages: [
|
|
1071
|
+
{
|
|
1072
|
+
package: {
|
|
1073
|
+
name: 'example-library',
|
|
1074
|
+
version: '1.2.3',
|
|
1075
|
+
ecosystem: 'npm',
|
|
1076
|
+
},
|
|
1077
|
+
vulnerabilities: [
|
|
1078
|
+
{
|
|
1079
|
+
id: 'GHSA-1111-2222-3333',
|
|
1080
|
+
aliases: [],
|
|
1081
|
+
summary: 'Example Library Deserialization',
|
|
1082
|
+
},
|
|
1083
|
+
],
|
|
1084
|
+
},
|
|
1085
|
+
],
|
|
1086
|
+
},
|
|
1087
|
+
],
|
|
1088
|
+
}),
|
|
1089
|
+
stderr: '',
|
|
1090
|
+
exitCode: 1,
|
|
1091
|
+
};
|
|
1092
|
+
}
|
|
1093
|
+
return { stdout: '', stderr: '', exitCode: 0 };
|
|
1094
|
+
},
|
|
1095
|
+
);
|
|
1096
|
+
|
|
1097
|
+
await useCase.run({
|
|
1098
|
+
targetDates: [new Date('2024-01-02T05:00:00Z')],
|
|
1099
|
+
org: 'example-org',
|
|
1100
|
+
manager: 'manager-name',
|
|
1101
|
+
dailySecurityScan: {
|
|
1102
|
+
scanBaseDirectory: '/repos',
|
|
1103
|
+
targetHourUtc: 5,
|
|
1104
|
+
},
|
|
1105
|
+
});
|
|
1106
|
+
|
|
1107
|
+
expect(errorSpy).toHaveBeenCalledWith(
|
|
1108
|
+
expect.stringContaining('oversized'),
|
|
1109
|
+
);
|
|
1110
|
+
expect(
|
|
1111
|
+
mockIssueRepository.createNewIssue.mock.calls.map((call) => call[1]),
|
|
1112
|
+
).toEqual(['app']);
|
|
1113
|
+
errorSpy.mockRestore();
|
|
1114
|
+
});
|
|
1115
|
+
|
|
912
1116
|
it('adds a comment to the existing open issue for the repository instead of creating a new one', async () => {
|
|
913
1117
|
const { useCase, mockLocalCommandRunner, mockIssueRepository } =
|
|
914
1118
|
buildUseCase();
|
|
@@ -1111,6 +1315,53 @@ describe('DailySecurityScanUseCase', () => {
|
|
|
1111
1315
|
},
|
|
1112
1316
|
});
|
|
1113
1317
|
|
|
1318
|
+
it('still reports KEV additions when the scanned repository findings issue cannot be written', async () => {
|
|
1319
|
+
const { useCase, mockIssueRepository } = buildScanEnvironment(
|
|
1320
|
+
osvScanOutput([
|
|
1321
|
+
{
|
|
1322
|
+
name: 'example-library',
|
|
1323
|
+
version: '1.2.3',
|
|
1324
|
+
ecosystem: 'npm',
|
|
1325
|
+
id: 'GHSA-1111-2222-3333',
|
|
1326
|
+
aliases: ['CVE-2024-0001'],
|
|
1327
|
+
summary: 'Example Library Deserialization',
|
|
1328
|
+
},
|
|
1329
|
+
]),
|
|
1330
|
+
{
|
|
1331
|
+
vulnerabilities: [
|
|
1332
|
+
{
|
|
1333
|
+
cveID: 'CVE-2024-0001',
|
|
1334
|
+
vendorProject: 'Example',
|
|
1335
|
+
product: 'Example Library',
|
|
1336
|
+
vulnerabilityName: 'Example Library Deserialization',
|
|
1337
|
+
dateAdded: '2024-01-02',
|
|
1338
|
+
},
|
|
1339
|
+
],
|
|
1340
|
+
},
|
|
1341
|
+
);
|
|
1342
|
+
const errorSpy = jest
|
|
1343
|
+
.spyOn(console, 'error')
|
|
1344
|
+
.mockImplementation(() => undefined);
|
|
1345
|
+
mockIssueRepository.createNewIssue.mockImplementation(
|
|
1346
|
+
async (_org, repositoryName) => {
|
|
1347
|
+
if (repositoryName === 'app') {
|
|
1348
|
+
throw new Error(
|
|
1349
|
+
'Request failed with status code 403: Repository was archived so is read-only.',
|
|
1350
|
+
);
|
|
1351
|
+
}
|
|
1352
|
+
return 1;
|
|
1353
|
+
},
|
|
1354
|
+
);
|
|
1355
|
+
|
|
1356
|
+
await runWithKevReporting(useCase);
|
|
1357
|
+
|
|
1358
|
+
expect(errorSpy).toHaveBeenCalledWith(expect.stringContaining('app'));
|
|
1359
|
+
expect(
|
|
1360
|
+
kevReportCalls(mockIssueRepository.createNewIssue.mock.calls),
|
|
1361
|
+
).toHaveLength(1);
|
|
1362
|
+
errorSpy.mockRestore();
|
|
1363
|
+
});
|
|
1364
|
+
|
|
1114
1365
|
it('reports a KEV addition whose CVE the scanner found at an installed version', async () => {
|
|
1115
1366
|
const { useCase, mockIssueRepository } = buildScanEnvironment(
|
|
1116
1367
|
osvScanOutput([
|
|
@@ -303,29 +303,35 @@ export class DailySecurityScanUseCase {
|
|
|
303
303
|
scannedVulnerablePackages.push(...vulnerablePackages);
|
|
304
304
|
|
|
305
305
|
const findingsBody = renderScannerFindings(today, vulnerablePackages);
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
type: 'issue',
|
|
310
|
-
state: 'open',
|
|
311
|
-
title: 'Daily security scan findings',
|
|
312
|
-
});
|
|
313
|
-
const existingIssue = existingIssues.find(
|
|
314
|
-
(issue) => issue.title === 'Daily security scan findings',
|
|
315
|
-
);
|
|
316
|
-
if (existingIssue) {
|
|
317
|
-
await this.issueRepository.createCommentByUrl(
|
|
318
|
-
existingIssue.url,
|
|
319
|
-
findingsBody,
|
|
320
|
-
);
|
|
321
|
-
} else {
|
|
322
|
-
await this.issueRepository.createNewIssue(
|
|
323
|
-
repositoryOrg,
|
|
306
|
+
try {
|
|
307
|
+
const existingIssues = await this.issueRepository.searchIssue({
|
|
308
|
+
owner: repositoryOrg,
|
|
324
309
|
repositoryName,
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
310
|
+
type: 'issue',
|
|
311
|
+
state: 'open',
|
|
312
|
+
title: 'Daily security scan findings',
|
|
313
|
+
});
|
|
314
|
+
const existingIssue = existingIssues.find(
|
|
315
|
+
(issue) => issue.title === 'Daily security scan findings',
|
|
316
|
+
);
|
|
317
|
+
if (existingIssue) {
|
|
318
|
+
await this.issueRepository.createCommentByUrl(
|
|
319
|
+
existingIssue.url,
|
|
320
|
+
findingsBody,
|
|
321
|
+
);
|
|
322
|
+
} else {
|
|
323
|
+
await this.issueRepository.createNewIssue(
|
|
324
|
+
repositoryOrg,
|
|
325
|
+
repositoryName,
|
|
326
|
+
'Daily security scan findings',
|
|
327
|
+
findingsBody,
|
|
328
|
+
[manager],
|
|
329
|
+
[],
|
|
330
|
+
);
|
|
331
|
+
}
|
|
332
|
+
} catch (error) {
|
|
333
|
+
console.error(
|
|
334
|
+
`The findings of ${repositoryOrg}/${repositoryName} were not written to GitHub: ${String(error)}. The remaining repositories are still scanned and the CISA KEV report still runs.`,
|
|
329
335
|
);
|
|
330
336
|
}
|
|
331
337
|
}
|
|
@@ -476,6 +476,39 @@ describe('LiveSessionOauthTokenSelectUseCase', () => {
|
|
|
476
476
|
});
|
|
477
477
|
});
|
|
478
478
|
|
|
479
|
+
describe('LiveSessionOauthTokenCandidateMetrics selectionWeight', () => {
|
|
480
|
+
const useCase = new LiveSessionOauthTokenSelectUseCase();
|
|
481
|
+
|
|
482
|
+
it('includes the configured selection weight in each candidate metric', () => {
|
|
483
|
+
const result = useCase.run(
|
|
484
|
+
[
|
|
485
|
+
withSelectionWeight(candidate('heavy', snapshot({})), 2),
|
|
486
|
+
candidate('normal', snapshot({})),
|
|
487
|
+
],
|
|
488
|
+
[],
|
|
489
|
+
NOW,
|
|
490
|
+
SETTINGS,
|
|
491
|
+
);
|
|
492
|
+
|
|
493
|
+
const heavy = result.metrics.find((m) => m.name === 'heavy');
|
|
494
|
+
const normal = result.metrics.find((m) => m.name === 'normal');
|
|
495
|
+
expect(heavy?.selectionWeight).toBe(2);
|
|
496
|
+
expect(normal?.selectionWeight).toBe(1);
|
|
497
|
+
});
|
|
498
|
+
|
|
499
|
+
it('reports selection weight one for a candidate without an explicit selectionWeight', () => {
|
|
500
|
+
const result = useCase.run(
|
|
501
|
+
[candidate('implicit', snapshot({}))],
|
|
502
|
+
[],
|
|
503
|
+
NOW,
|
|
504
|
+
SETTINGS,
|
|
505
|
+
);
|
|
506
|
+
|
|
507
|
+
const implicit = result.metrics.find((m) => m.name === 'implicit');
|
|
508
|
+
expect(implicit?.selectionWeight).toBe(1);
|
|
509
|
+
});
|
|
510
|
+
});
|
|
511
|
+
|
|
479
512
|
describe('liveSessionConcurrentLimitOf', () => {
|
|
480
513
|
it('gives the full limit while the five hour window is at or above the full speed free ratio', () => {
|
|
481
514
|
expect(liveSessionConcurrentLimitOf(1, 1, SETTINGS)).toBe(
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { ClaudeLiveSession } from './adapter-interfaces/ClaudeLiveSessionRepository';
|
|
1
|
+
import type { ClaudeLiveSession } from './adapter-interfaces/ClaudeLiveSessionRepository';
|
|
2
2
|
import {
|
|
3
|
-
OauthTokenCandidate,
|
|
3
|
+
type OauthTokenCandidate,
|
|
4
4
|
OauthTokenSelectUseCase,
|
|
5
5
|
selectionWeightOf,
|
|
6
6
|
} from './OauthTokenSelectUseCase';
|
|
@@ -45,6 +45,7 @@ export type LiveSessionOauthTokenCandidateMetrics = {
|
|
|
45
45
|
hasConcurrencyHeadroom: boolean;
|
|
46
46
|
eligible: boolean;
|
|
47
47
|
exclusionReason: string | null;
|
|
48
|
+
selectionWeight: number;
|
|
48
49
|
};
|
|
49
50
|
|
|
50
51
|
export type LiveSessionOauthTokenSelectResult = {
|
|
@@ -91,6 +92,7 @@ export class LiveSessionOauthTokenSelectUseCase {
|
|
|
91
92
|
hasConcurrencyHeadroom: liveSessionCount < concurrentSessionLimit,
|
|
92
93
|
eligible: rateLimitMetric.eligible,
|
|
93
94
|
exclusionReason: rateLimitMetric.exclusionReason,
|
|
95
|
+
selectionWeight: selectionWeightOf(candidate),
|
|
94
96
|
},
|
|
95
97
|
};
|
|
96
98
|
});
|
|
@@ -439,6 +439,94 @@ describe('OauthTokenSelectUseCase selectionWeight', () => {
|
|
|
439
439
|
});
|
|
440
440
|
});
|
|
441
441
|
|
|
442
|
+
describe('OauthTokenCandidateMetrics drawWeight', () => {
|
|
443
|
+
const useCase = new OauthTokenSelectUseCase();
|
|
444
|
+
|
|
445
|
+
it('reports draw weight zero for an ineligible candidate', () => {
|
|
446
|
+
const result = useCase.run(
|
|
447
|
+
[
|
|
448
|
+
candidate('busy5h', snapshot({ fiveHourUtilization: 0.9 })),
|
|
449
|
+
candidate('ok', snapshot({})),
|
|
450
|
+
],
|
|
451
|
+
NOW,
|
|
452
|
+
);
|
|
453
|
+
|
|
454
|
+
const busy = result.metrics.find((m) => m.name === 'busy5h');
|
|
455
|
+
expect(busy?.drawWeight).toBe(0);
|
|
456
|
+
});
|
|
457
|
+
|
|
458
|
+
it('reports a positive draw weight for an eligible candidate', () => {
|
|
459
|
+
const result = useCase.run(
|
|
460
|
+
[candidate('eligible', snapshot({ sevenDayReset: NOW + 2 * DAY }))],
|
|
461
|
+
NOW,
|
|
462
|
+
);
|
|
463
|
+
|
|
464
|
+
const eligible = result.metrics.find((m) => m.name === 'eligible');
|
|
465
|
+
expect(eligible?.drawWeight).toBeGreaterThan(0);
|
|
466
|
+
});
|
|
467
|
+
|
|
468
|
+
it('gives a higher draw weight to a candidate whose 7d window resets sooner', () => {
|
|
469
|
+
const result = useCase.run(
|
|
470
|
+
[
|
|
471
|
+
candidate('soon', snapshot({ sevenDayReset: NOW + 2 * DAY })),
|
|
472
|
+
candidate('far', snapshot({ sevenDayReset: NOW + 6 * DAY })),
|
|
473
|
+
],
|
|
474
|
+
NOW,
|
|
475
|
+
);
|
|
476
|
+
|
|
477
|
+
const soon = result.metrics.find((m) => m.name === 'soon');
|
|
478
|
+
const far = result.metrics.find((m) => m.name === 'far');
|
|
479
|
+
expect(soon?.drawWeight ?? 0).toBeGreaterThan(far?.drawWeight ?? 0);
|
|
480
|
+
});
|
|
481
|
+
|
|
482
|
+
it('scales draw weight by the configured selection weight', () => {
|
|
483
|
+
const result = useCase.run(
|
|
484
|
+
[
|
|
485
|
+
withSelectionWeight(
|
|
486
|
+
candidate('double', snapshot({ sevenDayReset: NOW + 2 * DAY })),
|
|
487
|
+
2,
|
|
488
|
+
),
|
|
489
|
+
withSelectionWeight(
|
|
490
|
+
candidate('single', snapshot({ sevenDayReset: NOW + 2 * DAY })),
|
|
491
|
+
1,
|
|
492
|
+
),
|
|
493
|
+
],
|
|
494
|
+
NOW,
|
|
495
|
+
);
|
|
496
|
+
|
|
497
|
+
const double = result.metrics.find((m) => m.name === 'double');
|
|
498
|
+
const single = result.metrics.find((m) => m.name === 'single');
|
|
499
|
+
expect(double?.drawWeight).toBeCloseTo((single?.drawWeight ?? 0) * 2, 5);
|
|
500
|
+
});
|
|
501
|
+
|
|
502
|
+
it('draws on exactly the weight it reports, so the trace cannot disagree with the draw', () => {
|
|
503
|
+
const candidates = [
|
|
504
|
+
withSelectionWeight(
|
|
505
|
+
candidate('double', snapshot({ sevenDayReset: NOW + 2 * DAY })),
|
|
506
|
+
2,
|
|
507
|
+
),
|
|
508
|
+
withSelectionWeight(
|
|
509
|
+
candidate('single', snapshot({ sevenDayReset: NOW + 2 * DAY })),
|
|
510
|
+
1,
|
|
511
|
+
),
|
|
512
|
+
];
|
|
513
|
+
|
|
514
|
+
const reported = useCase.run(candidates, NOW, () => 0).metrics;
|
|
515
|
+
const doubleWeight =
|
|
516
|
+
reported.find((m) => m.name === 'double')?.drawWeight ?? 0;
|
|
517
|
+
const singleWeight =
|
|
518
|
+
reported.find((m) => m.name === 'single')?.drawWeight ?? 0;
|
|
519
|
+
const boundary = doubleWeight / (doubleWeight + singleWeight);
|
|
520
|
+
|
|
521
|
+
expect(
|
|
522
|
+
useCase.run(candidates, NOW, () => boundary - 0.01).selected?.name,
|
|
523
|
+
).toBe('double');
|
|
524
|
+
expect(
|
|
525
|
+
useCase.run(candidates, NOW, () => boundary + 0.01).selected?.name,
|
|
526
|
+
).toBe('single');
|
|
527
|
+
});
|
|
528
|
+
});
|
|
529
|
+
|
|
442
530
|
describe('sevenDayUrgencyFactor', () => {
|
|
443
531
|
const now = 1_000_000;
|
|
444
532
|
|
|
@@ -31,6 +31,7 @@ export type OauthTokenCandidateMetrics = {
|
|
|
31
31
|
sevenDayEndEpoch: number;
|
|
32
32
|
eligible: boolean;
|
|
33
33
|
exclusionReason: string | null;
|
|
34
|
+
drawWeight: number;
|
|
34
35
|
};
|
|
35
36
|
|
|
36
37
|
export type OauthTokenSelectResult = {
|
|
@@ -91,13 +92,26 @@ export class OauthTokenSelectUseCase {
|
|
|
91
92
|
nowEpochSeconds: number,
|
|
92
93
|
random: SelectionRandom = Math.random,
|
|
93
94
|
): OauthTokenSelectResult => {
|
|
94
|
-
const evaluated = candidates.map((candidate) =>
|
|
95
|
-
candidate,
|
|
96
|
-
|
|
97
|
-
|
|
95
|
+
const evaluated = candidates.map((candidate) => {
|
|
96
|
+
const evaluatedMetric = this.evaluate(candidate, nowEpochSeconds);
|
|
97
|
+
return {
|
|
98
|
+
candidate,
|
|
99
|
+
metric: {
|
|
100
|
+
...evaluatedMetric,
|
|
101
|
+
drawWeight: evaluatedMetric.eligible
|
|
102
|
+
? selectionWeightOf(candidate) *
|
|
103
|
+
sevenDayUrgencyFactor(
|
|
104
|
+
evaluatedMetric.sevenDayFreeRatio,
|
|
105
|
+
evaluatedMetric.sevenDayEndEpoch,
|
|
106
|
+
nowEpochSeconds,
|
|
107
|
+
)
|
|
108
|
+
: 0,
|
|
109
|
+
},
|
|
110
|
+
};
|
|
111
|
+
});
|
|
98
112
|
|
|
99
|
-
const metrics = evaluated.map((entry) => entry.metric);
|
|
100
113
|
const eligible = evaluated.filter((entry) => entry.metric.eligible);
|
|
114
|
+
const metrics = evaluated.map((entry) => entry.metric);
|
|
101
115
|
|
|
102
116
|
if (eligible.length === 0) {
|
|
103
117
|
return { selected: null, metrics };
|
|
@@ -111,13 +125,7 @@ export class OauthTokenSelectUseCase {
|
|
|
111
125
|
|
|
112
126
|
const selected = selectWeightedCandidate(
|
|
113
127
|
eligible,
|
|
114
|
-
(entry) =>
|
|
115
|
-
selectionWeightOf(entry.candidate) *
|
|
116
|
-
sevenDayUrgencyFactor(
|
|
117
|
-
entry.metric.sevenDayFreeRatio,
|
|
118
|
-
entry.metric.sevenDayEndEpoch,
|
|
119
|
-
nowEpochSeconds,
|
|
120
|
-
),
|
|
128
|
+
(entry) => entry.metric.drawWeight,
|
|
121
129
|
deterministicBest,
|
|
122
130
|
random,
|
|
123
131
|
);
|
|
@@ -128,7 +136,7 @@ export class OauthTokenSelectUseCase {
|
|
|
128
136
|
private evaluate = (
|
|
129
137
|
candidate: OauthTokenCandidate,
|
|
130
138
|
nowEpochSeconds: number,
|
|
131
|
-
): OauthTokenCandidateMetrics => {
|
|
139
|
+
): Omit<OauthTokenCandidateMetrics, 'drawWeight'> => {
|
|
132
140
|
const fiveHourFreeRatio = this.fiveHourFreeRatio(
|
|
133
141
|
candidate.snapshot,
|
|
134
142
|
nowEpochSeconds,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ClaudeLiveSessionRepository } from '../../../domain/usecases/adapter-interfaces/ClaudeLiveSessionRepository';
|
|
2
|
-
import {
|
|
1
|
+
import type { ClaudeLiveSessionRepository } from '../../../domain/usecases/adapter-interfaces/ClaudeLiveSessionRepository';
|
|
2
|
+
import { type LiveSessionOauthTokenSelectionSettings, LiveSessionOauthTokenSelectUseCase } from '../../../domain/usecases/LiveSessionOauthTokenSelectUseCase';
|
|
3
3
|
export type LiveSessionOauthTokenSelectHandlerInput = {
|
|
4
4
|
tokenListJsonPath: string | null;
|
|
5
5
|
cacheDirectory: string | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LiveSessionOauthTokenSelectHandler.d.ts","sourceRoot":"","sources":["../../../../src/adapter/entry-points/handlers/LiveSessionOauthTokenSelectHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,yEAAyE,CAAC;
|
|
1
|
+
{"version":3,"file":"LiveSessionOauthTokenSelectHandler.d.ts","sourceRoot":"","sources":["../../../../src/adapter/entry-points/handlers/LiveSessionOauthTokenSelectHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yEAAyE,CAAC;AAC3H,OAAO,EACL,KAAK,sCAAsC,EAE3C,kCAAkC,EACnC,MAAM,6DAA6D,CAAC;AAerE,MAAM,MAAM,uCAAuC,GAAG;IACpD,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,sCAAsC,CAAC;CAC3D,CAAC;AAEF,MAAM,MAAM,wCAAwC,GAAG;IACrD,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAEF,qBAAa,kCAAkC;IAE3C,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,qBAAqB;gBADrB,OAAO,GAAE,kCAA6E,EACtF,qBAAqB,GAAE,2BAAmE;IAG7G,MAAM,GACJ,OAAO,uCAAuC,KAC7C,wCAAwC,CAmEzC;IAEF,OAAO,CAAC,iBAAiB,CAyBvB;CACH"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { OauthTokenSelectUseCase, SelectionRandom } from '../../../domain/usecases/OauthTokenSelectUseCase';
|
|
1
|
+
import { OauthTokenSelectUseCase, type SelectionRandom } from '../../../domain/usecases/OauthTokenSelectUseCase';
|
|
2
2
|
export type OauthTokenSelectHandlerInput = {
|
|
3
3
|
tokenListJsonPath: string | null;
|
|
4
4
|
cacheDirectory: string | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OauthTokenSelectHandler.d.ts","sourceRoot":"","sources":["../../../../src/adapter/entry-points/handlers/OauthTokenSelectHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,uBAAuB,EACvB,eAAe,
|
|
1
|
+
{"version":3,"file":"OauthTokenSelectHandler.d.ts","sourceRoot":"","sources":["../../../../src/adapter/entry-points/handlers/OauthTokenSelectHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,uBAAuB,EACvB,KAAK,eAAe,EACrB,MAAM,kDAAkD,CAAC;AAQ1D,MAAM,MAAM,4BAA4B,GAAG;IACzC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAKF,eAAO,MAAM,wBAAwB,GACnC,cAAc,MAAM,GAAG,IAAI,KAC1B,MAAM,GAAG,IASX,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,mBAAmB,MAAM,GAAG,IAAI,KAC/B,MASF,CAAC;AAEF,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADN,OAAO,GAAE,uBAAuD,EAChE,MAAM,GAAE,eAA6B;IAGxD,MAAM,GACJ,OAAO,4BAA4B,KAClC,6BAA6B,CAgE9B;IAEF,OAAO,CAAC,iBAAiB,CAuBvB;CACH"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DailySecurityScanUseCase.d.ts","sourceRoot":"","sources":["../../../src/domain/usecases/DailySecurityScanUseCase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,4BAA4B,EAAE,MAAM,mDAAmD,CAAC;AAEjG,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,MAAM,MAAM,uBAAuB,GAAG;IACpC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAoJF,qBAAa,wBAAwB;IAEjC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB;IAC/C,QAAQ,CAAC,eAAe,EAAE,IAAI,CAC5B,eAAe,EACf,gBAAgB,GAAG,aAAa,GAAG,oBAAoB,CACxD;IACD,QAAQ,CAAC,cAAc,EAAE,cAAc;IACvC,QAAQ,CAAC,4BAA4B,EAAE,4BAA4B;gBAN1D,kBAAkB,EAAE,kBAAkB,EACtC,eAAe,EAAE,IAAI,CAC5B,eAAe,EACf,gBAAgB,GAAG,aAAa,GAAG,oBAAoB,CACxD,EACQ,cAAc,EAAE,cAAc,EAC9B,4BAA4B,EAAE,4BAA4B;IAGrE,GAAG,GAAU,OAAO;QAClB,WAAW,EAAE,IAAI,EAAE,CAAC;QACpB,GAAG,EAAE,MAAM,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QACxB,iBAAiB,EAAE,uBAAuB,CAAC;KAC5C,KAAG,OAAO,CAAC,IAAI,CAAC,CA2Bf;IAEF,OAAO,CAAC,gBAAgB,
|
|
1
|
+
{"version":3,"file":"DailySecurityScanUseCase.d.ts","sourceRoot":"","sources":["../../../src/domain/usecases/DailySecurityScanUseCase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,4BAA4B,EAAE,MAAM,mDAAmD,CAAC;AAEjG,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,MAAM,MAAM,uBAAuB,GAAG;IACpC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAoJF,qBAAa,wBAAwB;IAEjC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB;IAC/C,QAAQ,CAAC,eAAe,EAAE,IAAI,CAC5B,eAAe,EACf,gBAAgB,GAAG,aAAa,GAAG,oBAAoB,CACxD;IACD,QAAQ,CAAC,cAAc,EAAE,cAAc;IACvC,QAAQ,CAAC,4BAA4B,EAAE,4BAA4B;gBAN1D,kBAAkB,EAAE,kBAAkB,EACtC,eAAe,EAAE,IAAI,CAC5B,eAAe,EACf,gBAAgB,GAAG,aAAa,GAAG,oBAAoB,CACxD,EACQ,cAAc,EAAE,cAAc,EAC9B,4BAA4B,EAAE,4BAA4B;IAGrE,GAAG,GAAU,OAAO;QAClB,WAAW,EAAE,IAAI,EAAE,CAAC;QACpB,GAAG,EAAE,MAAM,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QACxB,iBAAiB,EAAE,uBAAuB,CAAC;KAC5C,KAAG,OAAO,CAAC,IAAI,CAAC,CA2Bf;IAEF,OAAO,CAAC,gBAAgB,CAqItB;IAEF,OAAO,CAAC,qBAAqB,CAoC3B;IAEF,OAAO,CAAC,kBAAkB,CAgGxB;CACH"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ClaudeLiveSession } from './adapter-interfaces/ClaudeLiveSessionRepository';
|
|
2
|
-
import { OauthTokenCandidate, OauthTokenSelectUseCase } from './OauthTokenSelectUseCase';
|
|
1
|
+
import type { ClaudeLiveSession } from './adapter-interfaces/ClaudeLiveSessionRepository';
|
|
2
|
+
import { type OauthTokenCandidate, OauthTokenSelectUseCase } from './OauthTokenSelectUseCase';
|
|
3
3
|
export type LiveSessionOauthTokenSelectionSettings = {
|
|
4
4
|
maxConcurrentSessionCount: number;
|
|
5
5
|
fullSpeedFiveHourFreeRatio: number;
|
|
@@ -16,6 +16,7 @@ export type LiveSessionOauthTokenCandidateMetrics = {
|
|
|
16
16
|
hasConcurrencyHeadroom: boolean;
|
|
17
17
|
eligible: boolean;
|
|
18
18
|
exclusionReason: string | null;
|
|
19
|
+
selectionWeight: number;
|
|
19
20
|
};
|
|
20
21
|
export type LiveSessionOauthTokenSelectResult = {
|
|
21
22
|
selected: OauthTokenCandidate | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LiveSessionOauthTokenSelectUseCase.d.ts","sourceRoot":"","sources":["../../../src/domain/usecases/LiveSessionOauthTokenSelectUseCase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kDAAkD,CAAC;
|
|
1
|
+
{"version":3,"file":"LiveSessionOauthTokenSelectUseCase.d.ts","sourceRoot":"","sources":["../../../src/domain/usecases/LiveSessionOauthTokenSelectUseCase.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kDAAkD,CAAC;AAC1F,OAAO,EACL,KAAK,mBAAmB,EACxB,uBAAuB,EAExB,MAAM,2BAA2B,CAAC;AAEnC,MAAM,MAAM,sCAAsC,GAAG;IACnD,yBAAyB,EAAE,MAAM,CAAC;IAClC,0BAA0B,EAAE,MAAM,CAAC;CACpC,CAAC;AAEF,eAAO,MAAM,mDAAmD,EAAE,sCAI/D,CAAC;AAEJ,eAAO,MAAM,4BAA4B,GACvC,mBAAmB,MAAM,EACzB,iBAAiB,MAAM,EACvB,UAAU,sCAAsC,KAC/C,MAaF,CAAC;AAEF,MAAM,MAAM,qCAAqC,GAAG;IAClD,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,sBAAsB,EAAE,OAAO,CAAC;IAChC,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACrC,OAAO,EAAE,qCAAqC,EAAE,CAAC;CAClD,CAAC;AAEF,qBAAa,kCAAkC;IAE3C,OAAO,CAAC,QAAQ,CAAC,sBAAsB;gBAAtB,sBAAsB,GAAE,uBAAuD;IAGlG,GAAG,GACD,YAAY,mBAAmB,EAAE,EACjC,cAAc,iBAAiB,EAAE,EACjC,iBAAiB,MAAM,EACvB,UAAU,sCAAsC,KAC/C,iCAAiC,CAgDlC;IAEF,OAAO,CAAC,SAAS,CAgBf;IAEF,OAAO,CAAC,uBAAuB,CAe7B;CACH"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OauthTokenSelectUseCase.d.ts","sourceRoot":"","sources":["../../../src/domain/usecases/OauthTokenSelectUseCase.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,wBAAwB,GAAG;IACrC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,wBAAwB,GAAG,IAAI,CAAC;IAC1C,oBAAoB,EAAE,OAAO,CAAC;IAC9B,eAAe,EAAE,OAAO,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,MAAM,MAAM,CAAC;AAE3C,eAAO,MAAM,wBAAwB,IAAI,CAAC;AAE1C,eAAO,MAAM,iBAAiB,GAAI,WAAW,mBAAmB,KAAG,MAGlE,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"OauthTokenSelectUseCase.d.ts","sourceRoot":"","sources":["../../../src/domain/usecases/OauthTokenSelectUseCase.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,wBAAwB,GAAG;IACrC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,wBAAwB,GAAG,IAAI,CAAC;IAC1C,oBAAoB,EAAE,OAAO,CAAC;IAC9B,eAAe,EAAE,OAAO,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,MAAM,MAAM,CAAC;AAE3C,eAAO,MAAM,wBAAwB,IAAI,CAAC;AAE1C,eAAO,MAAM,iBAAiB,GAAI,WAAW,mBAAmB,KAAG,MAGlE,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACrC,OAAO,EAAE,0BAA0B,EAAE,CAAC;CACvC,CAAC;AAKF,eAAO,MAAM,wBAAwB,OAAO,CAAC;AAC7C,eAAO,MAAM,wBAAwB,OAAO,CAAC;AAE7C,eAAO,MAAM,sBAAsB,MAAM,CAAC;AAC1C,eAAO,MAAM,kBAAkB,IAAI,CAAC;AAGpC,eAAO,MAAM,qBAAqB,GAChC,mBAAmB,MAAM,EACzB,kBAAkB,MAAM,EACxB,iBAAiB,MAAM,KACtB,MAMF,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,KAAK,EAC3C,UAAU,KAAK,EAAE,EACjB,UAAU,CAAC,KAAK,EAAE,KAAK,KAAK,MAAM,EAClC,mBAAmB,KAAK,EACxB,QAAQ,eAAe,KACtB,KAkBF,CAAC;AAEF,qBAAa,uBAAuB;IAClC,GAAG,GACD,YAAY,mBAAmB,EAAE,EACjC,iBAAiB,MAAM,EACvB,SAAQ,eAA6B,KACpC,sBAAsB,CAwCvB;IAEF,OAAO,CAAC,QAAQ,CAiCd;IAEF,OAAO,CAAC,eAAe,CAuBrB;IAEF,OAAO,CAAC,iBAAiB,CAWvB;IAEF,OAAO,CAAC,iBAAiB,CAWvB;IAEF,OAAO,CAAC,gBAAgB,CActB;IAEF,OAAO,CAAC,aAAa,CAGwC;IAE7D,OAAO,CAAC,wBAAwB,CAG9B;IAEF,OAAO,CAAC,SAAS,CAAsD;CACxE"}
|