@skillsmith/core 0.4.14 → 0.4.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -0
- package/dist/.tsbuildinfo +1 -1
- package/dist/src/api/client.d.ts +1 -0
- package/dist/src/api/client.d.ts.map +1 -1
- package/dist/src/api/client.health.d.ts +26 -0
- package/dist/src/api/client.health.d.ts.map +1 -0
- package/dist/src/api/client.health.js +74 -0
- package/dist/src/api/client.health.js.map +1 -0
- package/dist/src/api/client.js +3 -51
- package/dist/src/api/client.js.map +1 -1
- package/dist/src/db/createDatabase.d.ts +9 -1
- package/dist/src/db/createDatabase.d.ts.map +1 -1
- package/dist/src/db/createDatabase.js +9 -1
- package/dist/src/db/createDatabase.js.map +1 -1
- package/dist/src/db/drivers/sqljsDriver.d.ts.map +1 -1
- package/dist/src/db/drivers/sqljsDriver.js +5 -2
- package/dist/src/db/drivers/sqljsDriver.js.map +1 -1
- package/dist/src/db/migrations/v5b-change-type.d.ts +19 -0
- package/dist/src/db/migrations/v5b-change-type.d.ts.map +1 -0
- package/dist/src/db/migrations/v5b-change-type.js +22 -0
- package/dist/src/db/migrations/v5b-change-type.js.map +1 -0
- package/dist/src/db/migrations/v6-advisories.d.ts +32 -0
- package/dist/src/db/migrations/v6-advisories.d.ts.map +1 -0
- package/dist/src/db/migrations/v6-advisories.js +53 -0
- package/dist/src/db/migrations/v6-advisories.js.map +1 -0
- package/dist/src/db/migrations/v7-compatibility.d.ts +21 -0
- package/dist/src/db/migrations/v7-compatibility.d.ts.map +1 -0
- package/dist/src/db/migrations/v7-compatibility.js +23 -0
- package/dist/src/db/migrations/v7-compatibility.js.map +1 -0
- package/dist/src/db/migrations/v8-co-installs.d.ts +21 -0
- package/dist/src/db/migrations/v8-co-installs.d.ts.map +1 -0
- package/dist/src/db/migrations/v8-co-installs.js +33 -0
- package/dist/src/db/migrations/v8-co-installs.js.map +1 -0
- package/dist/src/db/schema.d.ts +5 -16
- package/dist/src/db/schema.d.ts.map +1 -1
- package/dist/src/db/schema.js +37 -22
- package/dist/src/db/schema.js.map +1 -1
- package/dist/src/exports/repositories.d.ts +5 -0
- package/dist/src/exports/repositories.d.ts.map +1 -1
- package/dist/src/exports/repositories.js +17 -0
- package/dist/src/exports/repositories.js.map +1 -1
- package/dist/src/exports/types.d.ts +1 -1
- package/dist/src/exports/types.d.ts.map +1 -1
- package/dist/src/exports/types.js.map +1 -1
- package/dist/src/indexer/SkillParser.d.ts +2 -0
- package/dist/src/indexer/SkillParser.d.ts.map +1 -1
- package/dist/src/indexer/SkillParser.js.map +1 -1
- package/dist/src/learning/PatternStore.d.ts +0 -2
- package/dist/src/learning/PatternStore.d.ts.map +1 -1
- package/dist/src/learning/PatternStore.helpers.d.ts +19 -1
- package/dist/src/learning/PatternStore.helpers.d.ts.map +1 -1
- package/dist/src/learning/PatternStore.helpers.js +51 -0
- package/dist/src/learning/PatternStore.helpers.js.map +1 -1
- package/dist/src/learning/PatternStore.js +5 -37
- package/dist/src/learning/PatternStore.js.map +1 -1
- package/dist/src/repositories/AdvisoryRepository.d.ts +80 -0
- package/dist/src/repositories/AdvisoryRepository.d.ts.map +1 -0
- package/dist/src/repositories/AdvisoryRepository.js +128 -0
- package/dist/src/repositories/AdvisoryRepository.js.map +1 -0
- package/dist/src/repositories/AdvisoryRepository.test.d.ts +6 -0
- package/dist/src/repositories/AdvisoryRepository.test.d.ts.map +1 -0
- package/dist/src/repositories/AdvisoryRepository.test.js +149 -0
- package/dist/src/repositories/AdvisoryRepository.test.js.map +1 -0
- package/dist/src/repositories/CoInstallRepository.d.ts +68 -0
- package/dist/src/repositories/CoInstallRepository.d.ts.map +1 -0
- package/dist/src/repositories/CoInstallRepository.js +122 -0
- package/dist/src/repositories/CoInstallRepository.js.map +1 -0
- package/dist/src/repositories/SkillRepository.d.ts.map +1 -1
- package/dist/src/repositories/SkillRepository.js +16 -5
- package/dist/src/repositories/SkillRepository.js.map +1 -1
- package/dist/src/services/SearchService.helpers.d.ts.map +1 -1
- package/dist/src/services/SearchService.helpers.js +4 -0
- package/dist/src/services/SearchService.helpers.js.map +1 -1
- package/dist/src/services/SearchService.types.d.ts +1 -0
- package/dist/src/services/SearchService.types.d.ts.map +1 -1
- package/dist/src/services/TaskRunner.d.ts +5 -81
- package/dist/src/services/TaskRunner.d.ts.map +1 -1
- package/dist/src/services/TaskRunner.js +7 -68
- package/dist/src/services/TaskRunner.js.map +1 -1
- package/dist/src/services/TaskRunner.process.d.ts +33 -0
- package/dist/src/services/TaskRunner.process.d.ts.map +1 -0
- package/dist/src/services/TaskRunner.process.js +70 -0
- package/dist/src/services/TaskRunner.process.js.map +1 -0
- package/dist/src/services/TaskRunner.types.d.ts +76 -0
- package/dist/src/services/TaskRunner.types.d.ts.map +1 -0
- package/dist/src/services/TaskRunner.types.js +22 -0
- package/dist/src/services/TaskRunner.types.js.map +1 -0
- package/dist/src/services/__tests__/TaskRunner.process.test.d.ts +13 -0
- package/dist/src/services/__tests__/TaskRunner.process.test.d.ts.map +1 -0
- package/dist/src/services/__tests__/TaskRunner.process.test.js +91 -0
- package/dist/src/services/__tests__/TaskRunner.process.test.js.map +1 -0
- package/dist/src/services/quarantine/QuarantineService.d.ts +3 -24
- package/dist/src/services/quarantine/QuarantineService.d.ts.map +1 -1
- package/dist/src/services/quarantine/QuarantineService.js +8 -205
- package/dist/src/services/quarantine/QuarantineService.js.map +1 -1
- package/dist/src/services/quarantine/QuarantineService.multiapproval.d.ts +57 -0
- package/dist/src/services/quarantine/QuarantineService.multiapproval.d.ts.map +1 -0
- package/dist/src/services/quarantine/QuarantineService.multiapproval.js +211 -0
- package/dist/src/services/quarantine/QuarantineService.multiapproval.js.map +1 -0
- package/dist/src/session/SessionManager.d.ts +2 -33
- package/dist/src/session/SessionManager.d.ts.map +1 -1
- package/dist/src/session/SessionManager.js +14 -238
- package/dist/src/session/SessionManager.js.map +1 -1
- package/dist/src/session/SessionManager.memory.d.ts +67 -0
- package/dist/src/session/SessionManager.memory.d.ts.map +1 -0
- package/dist/src/session/SessionManager.memory.js +262 -0
- package/dist/src/session/SessionManager.memory.js.map +1 -0
- package/dist/src/sync/SyncEngine.d.ts +13 -1
- package/dist/src/sync/SyncEngine.d.ts.map +1 -1
- package/dist/src/sync/SyncEngine.js +50 -1
- package/dist/src/sync/SyncEngine.js.map +1 -1
- package/dist/src/testing/MultiLLMProvider.d.ts +5 -6
- package/dist/src/testing/MultiLLMProvider.d.ts.map +1 -1
- package/dist/src/testing/MultiLLMProvider.js +18 -130
- package/dist/src/testing/MultiLLMProvider.js.map +1 -1
- package/dist/src/testing/MultiLLMProvider.metrics.d.ts +33 -0
- package/dist/src/testing/MultiLLMProvider.metrics.d.ts.map +1 -0
- package/dist/src/testing/MultiLLMProvider.metrics.js +87 -0
- package/dist/src/testing/MultiLLMProvider.metrics.js.map +1 -0
- package/dist/src/testing/MultiLLMProvider.selection.d.ts +77 -0
- package/dist/src/testing/MultiLLMProvider.selection.d.ts.map +1 -0
- package/dist/src/testing/MultiLLMProvider.selection.js +151 -0
- package/dist/src/testing/MultiLLMProvider.selection.js.map +1 -0
- package/dist/src/types/skill.d.ts +10 -0
- package/dist/src/types/skill.d.ts.map +1 -1
- package/dist/src/types.d.ts +30 -0
- package/dist/src/types.d.ts.map +1 -1
- package/dist/src/versioning/change-classifier.d.ts +38 -0
- package/dist/src/versioning/change-classifier.d.ts.map +1 -0
- package/dist/src/versioning/change-classifier.js +187 -0
- package/dist/src/versioning/change-classifier.js.map +1 -0
- package/dist/src/versioning/change-classifier.test.d.ts +6 -0
- package/dist/src/versioning/change-classifier.test.d.ts.map +1 -0
- package/dist/src/versioning/change-classifier.test.js +275 -0
- package/dist/src/versioning/change-classifier.test.js.map +1 -0
- package/dist/src/versioning/update-risk.d.ts +50 -0
- package/dist/src/versioning/update-risk.d.ts.map +1 -0
- package/dist/src/versioning/update-risk.js +80 -0
- package/dist/src/versioning/update-risk.js.map +1 -0
- package/dist/src/versioning/update-risk.test.d.ts +6 -0
- package/dist/src/versioning/update-risk.test.d.ts.map +1 -0
- package/dist/src/versioning/update-risk.test.js +200 -0
- package/dist/src/versioning/update-risk.test.js.map +1 -0
- package/dist/tests/AuditLogger.edge-cases.test.d.ts +10 -0
- package/dist/tests/AuditLogger.edge-cases.test.d.ts.map +1 -0
- package/dist/tests/AuditLogger.edge-cases.test.js +183 -0
- package/dist/tests/AuditLogger.edge-cases.test.js.map +1 -0
- package/dist/tests/CacheManager.test.d.ts +9 -0
- package/dist/tests/CacheManager.test.d.ts.map +1 -0
- package/dist/tests/CacheManager.test.js +163 -0
- package/dist/tests/CacheManager.test.js.map +1 -0
- package/dist/tests/GitHubIndexer.edge-cases.test.d.ts +10 -0
- package/dist/tests/GitHubIndexer.edge-cases.test.d.ts.map +1 -0
- package/dist/tests/GitHubIndexer.edge-cases.test.js +255 -0
- package/dist/tests/GitHubIndexer.edge-cases.test.js.map +1 -0
- package/dist/tests/SearchService.test.js +71 -0
- package/dist/tests/SearchService.test.js.map +1 -1
- package/dist/tests/SkillVersionRepository.test.d.ts +0 -11
- package/dist/tests/SkillVersionRepository.test.d.ts.map +1 -1
- package/dist/tests/SkillVersionRepository.test.js +131 -194
- package/dist/tests/SkillVersionRepository.test.js.map +1 -1
- package/dist/tests/api/client.health.test.d.ts +15 -0
- package/dist/tests/api/client.health.test.d.ts.map +1 -0
- package/dist/tests/api/client.health.test.js +111 -0
- package/dist/tests/api/client.health.test.js.map +1 -0
- package/dist/tests/db/betterSqlite3Driver.test.d.ts +8 -0
- package/dist/tests/db/betterSqlite3Driver.test.d.ts.map +1 -0
- package/dist/tests/db/betterSqlite3Driver.test.js +88 -0
- package/dist/tests/db/betterSqlite3Driver.test.js.map +1 -0
- package/dist/tests/db/database-abstraction.test.js +12 -0
- package/dist/tests/db/database-abstraction.test.js.map +1 -1
- package/dist/tests/db/schema-migrations.test.d.ts +10 -0
- package/dist/tests/db/schema-migrations.test.d.ts.map +1 -0
- package/dist/tests/db/schema-migrations.test.js +134 -0
- package/dist/tests/db/schema-migrations.test.js.map +1 -0
- package/dist/tests/db/sqljsDriver.test.d.ts +9 -0
- package/dist/tests/db/sqljsDriver.test.d.ts.map +1 -0
- package/dist/tests/db/sqljsDriver.test.js +75 -0
- package/dist/tests/db/sqljsDriver.test.js.map +1 -0
- package/dist/tests/helpers/database.d.ts +32 -0
- package/dist/tests/helpers/database.d.ts.map +1 -0
- package/dist/tests/helpers/database.js +54 -0
- package/dist/tests/helpers/database.js.map +1 -0
- package/dist/tests/learning/PatternStore.helpers.test.d.ts +17 -0
- package/dist/tests/learning/PatternStore.helpers.test.d.ts.map +1 -0
- package/dist/tests/learning/PatternStore.helpers.test.js +301 -0
- package/dist/tests/learning/PatternStore.helpers.test.js.map +1 -0
- package/dist/tests/repositories/CoInstallRepository.test.d.ts +9 -0
- package/dist/tests/repositories/CoInstallRepository.test.d.ts.map +1 -0
- package/dist/tests/repositories/CoInstallRepository.test.js +126 -0
- package/dist/tests/repositories/CoInstallRepository.test.js.map +1 -0
- package/dist/tests/routing/LanguageRouter.test.d.ts +9 -0
- package/dist/tests/routing/LanguageRouter.test.d.ts.map +1 -0
- package/dist/tests/routing/LanguageRouter.test.js +150 -0
- package/dist/tests/routing/LanguageRouter.test.js.map +1 -0
- package/dist/tests/session/SessionManager.memory.test.d.ts +11 -0
- package/dist/tests/session/SessionManager.memory.test.d.ts.map +1 -0
- package/dist/tests/session/SessionManager.memory.test.js +219 -0
- package/dist/tests/session/SessionManager.memory.test.js.map +1 -0
- package/dist/tests/sync/SyncEngine.test.js +32 -18
- package/dist/tests/sync/SyncEngine.test.js.map +1 -1
- package/dist/tests/testing/MultiLLMProvider.metrics.test.d.ts +13 -0
- package/dist/tests/testing/MultiLLMProvider.metrics.test.d.ts.map +1 -0
- package/dist/tests/testing/MultiLLMProvider.metrics.test.js +149 -0
- package/dist/tests/testing/MultiLLMProvider.metrics.test.js.map +1 -0
- package/dist/tests/testing/MultiLLMProvider.selection.test.d.ts +15 -0
- package/dist/tests/testing/MultiLLMProvider.selection.test.d.ts.map +1 -0
- package/dist/tests/testing/MultiLLMProvider.selection.test.js +249 -0
- package/dist/tests/testing/MultiLLMProvider.selection.test.js.map +1 -0
- package/dist/tests/unit/quarantine-query-builder.test.d.ts +10 -0
- package/dist/tests/unit/quarantine-query-builder.test.d.ts.map +1 -0
- package/dist/tests/unit/quarantine-query-builder.test.js +157 -0
- package/dist/tests/unit/quarantine-query-builder.test.js.map +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @fileoverview TaskRunner Process Management Utilities
|
|
3
|
+
* @module @skillsmith/core/services/TaskRunner.process
|
|
4
|
+
* @see SMI-1662: TaskRunner - Background Task Timeout Management
|
|
5
|
+
* @see SMI-2741: Split from TaskRunner.ts to meet 500-line standard
|
|
6
|
+
*
|
|
7
|
+
* Low-level process lifecycle management for background task cleanup:
|
|
8
|
+
* - Graceful shutdown with SIGTERM → SIGKILL escalation
|
|
9
|
+
* - Immediate kill with SIGKILL
|
|
10
|
+
* - Sleep utility for grace period waiting
|
|
11
|
+
*/
|
|
12
|
+
import { SIGKILL_GRACE_PERIOD_MS } from './TaskRunner.types.js';
|
|
13
|
+
/**
|
|
14
|
+
* Gracefully shutdown a process: SIGTERM -> wait -> SIGKILL
|
|
15
|
+
*
|
|
16
|
+
* Sends SIGTERM first to allow graceful shutdown, waits for the
|
|
17
|
+
* grace period, then escalates to SIGKILL if the process is still running.
|
|
18
|
+
*
|
|
19
|
+
* @param pid - Process ID to shutdown
|
|
20
|
+
*/
|
|
21
|
+
export async function gracefulShutdown(pid) {
|
|
22
|
+
// First, send SIGTERM for graceful shutdown
|
|
23
|
+
try {
|
|
24
|
+
process.kill(pid, 'SIGTERM');
|
|
25
|
+
}
|
|
26
|
+
catch (error) {
|
|
27
|
+
// Process might already be dead
|
|
28
|
+
if (error.code === 'ESRCH') {
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
throw error;
|
|
32
|
+
}
|
|
33
|
+
// Wait for grace period
|
|
34
|
+
await sleep(SIGKILL_GRACE_PERIOD_MS);
|
|
35
|
+
// Check if still running and send SIGKILL
|
|
36
|
+
try {
|
|
37
|
+
// process.kill(pid, 0) checks if process exists
|
|
38
|
+
process.kill(pid, 0);
|
|
39
|
+
// Process still running, send SIGKILL
|
|
40
|
+
process.kill(pid, 'SIGKILL');
|
|
41
|
+
}
|
|
42
|
+
catch {
|
|
43
|
+
// Process is already dead, which is fine
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* Kill a process immediately with SIGKILL
|
|
48
|
+
*
|
|
49
|
+
* @param pid - Process ID to kill
|
|
50
|
+
*/
|
|
51
|
+
export async function killProcess(pid) {
|
|
52
|
+
try {
|
|
53
|
+
process.kill(pid, 'SIGKILL');
|
|
54
|
+
}
|
|
55
|
+
catch (error) {
|
|
56
|
+
// ESRCH means process doesn't exist, which is fine
|
|
57
|
+
if (error.code !== 'ESRCH') {
|
|
58
|
+
throw error;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Sleep for a specified duration
|
|
64
|
+
*
|
|
65
|
+
* @param ms - Duration in milliseconds
|
|
66
|
+
*/
|
|
67
|
+
export function sleep(ms) {
|
|
68
|
+
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
69
|
+
}
|
|
70
|
+
//# sourceMappingURL=TaskRunner.process.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"TaskRunner.process.js","sourceRoot":"","sources":["../../../src/services/TaskRunner.process.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAE/D;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,GAAW;IAChD,4CAA4C;IAC5C,IAAI,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IAC9B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,gCAAgC;QAChC,IAAK,KAA+B,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACtD,OAAM;QACR,CAAC;QACD,MAAM,KAAK,CAAA;IACb,CAAC;IAED,wBAAwB;IACxB,MAAM,KAAK,CAAC,uBAAuB,CAAC,CAAA;IAEpC,0CAA0C;IAC1C,IAAI,CAAC;QACH,gDAAgD;QAChD,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;QACpB,sCAAsC;QACtC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IAC9B,CAAC;IAAC,MAAM,CAAC;QACP,yCAAyC;IAC3C,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,GAAW;IAC3C,IAAI,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IAC9B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,mDAAmD;QACnD,IAAK,KAA+B,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACtD,MAAM,KAAK,CAAA;QACb,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,KAAK,CAAC,EAAU;IAC9B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAA;AAC1D,CAAC"}
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @fileoverview TaskRunner Type Definitions and Constants
|
|
3
|
+
* @module @skillsmith/core/services/TaskRunner.types
|
|
4
|
+
* @see SMI-1662: TaskRunner - Background Task Timeout Management
|
|
5
|
+
* @see SMI-2741: Split from TaskRunner.ts to meet 500-line standard
|
|
6
|
+
*/
|
|
7
|
+
import type { Logger } from '../utils/logger.js';
|
|
8
|
+
/**
|
|
9
|
+
* Default timeout: 10 minutes (600000ms)
|
|
10
|
+
*/
|
|
11
|
+
export declare const DEFAULT_TASK_TIMEOUT_MS = 600000;
|
|
12
|
+
/**
|
|
13
|
+
* Grace period before SIGKILL after SIGTERM: 5 seconds
|
|
14
|
+
*/
|
|
15
|
+
export declare const SIGKILL_GRACE_PERIOD_MS = 5000;
|
|
16
|
+
/**
|
|
17
|
+
* Warning threshold: 80% of timeout
|
|
18
|
+
*/
|
|
19
|
+
export declare const WARNING_THRESHOLD_RATIO = 0.8;
|
|
20
|
+
/**
|
|
21
|
+
* Configuration options for TaskRunner
|
|
22
|
+
*/
|
|
23
|
+
export interface TaskRunnerConfig {
|
|
24
|
+
/** Timeout in milliseconds (default: 600000 = 10 minutes) */
|
|
25
|
+
timeoutMs?: number;
|
|
26
|
+
/** Enable debug logging (default: false) */
|
|
27
|
+
debug?: boolean;
|
|
28
|
+
/** Custom logger instance */
|
|
29
|
+
logger?: Logger;
|
|
30
|
+
/** Callback when a task times out */
|
|
31
|
+
onTimeout?: (task: TrackedTask) => void;
|
|
32
|
+
/** Callback when warning threshold is reached */
|
|
33
|
+
onWarning?: (task: TrackedTask, remainingMs: number) => void;
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* Status of a tracked task
|
|
37
|
+
*/
|
|
38
|
+
export type TaskStatus = 'running' | 'completed' | 'failed' | 'timeout' | 'killed';
|
|
39
|
+
/**
|
|
40
|
+
* A tracked background task
|
|
41
|
+
*/
|
|
42
|
+
export interface TrackedTask {
|
|
43
|
+
/** Unique task identifier */
|
|
44
|
+
id: string;
|
|
45
|
+
/** Process ID of the background task */
|
|
46
|
+
pid: number;
|
|
47
|
+
/** Human-readable description */
|
|
48
|
+
description: string;
|
|
49
|
+
/** When the task started */
|
|
50
|
+
startedAt: number;
|
|
51
|
+
/** Current status */
|
|
52
|
+
status: TaskStatus;
|
|
53
|
+
/** When the task completed/failed/timed out */
|
|
54
|
+
endedAt?: number;
|
|
55
|
+
/** Duration in milliseconds */
|
|
56
|
+
durationMs?: number;
|
|
57
|
+
/** Whether warning was issued */
|
|
58
|
+
warningIssued: boolean;
|
|
59
|
+
/** Error message if failed */
|
|
60
|
+
error?: string;
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Result of a cleanup operation
|
|
64
|
+
*/
|
|
65
|
+
export interface CleanupResult {
|
|
66
|
+
/** Number of tasks cleaned up */
|
|
67
|
+
cleaned: number;
|
|
68
|
+
/** Task IDs that were cleaned */
|
|
69
|
+
taskIds: string[];
|
|
70
|
+
/** Any errors encountered */
|
|
71
|
+
errors: Array<{
|
|
72
|
+
taskId: string;
|
|
73
|
+
error: string;
|
|
74
|
+
}>;
|
|
75
|
+
}
|
|
76
|
+
//# sourceMappingURL=TaskRunner.types.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"TaskRunner.types.d.ts","sourceRoot":"","sources":["../../../src/services/TaskRunner.types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAMhD;;GAEG;AACH,eAAO,MAAM,uBAAuB,SAAS,CAAA;AAE7C;;GAEG;AACH,eAAO,MAAM,uBAAuB,OAAO,CAAA;AAE3C;;GAEG;AACH,eAAO,MAAM,uBAAuB,MAAM,CAAA;AAM1C;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,6DAA6D;IAC7D,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,4CAA4C;IAC5C,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,6BAA6B;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,qCAAqC;IACrC,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,CAAA;IACvC,iDAAiD;IACjD,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,KAAK,IAAI,CAAA;CAC7D;AAED;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,SAAS,GAAG,QAAQ,CAAA;AAElF;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,6BAA6B;IAC7B,EAAE,EAAE,MAAM,CAAA;IACV,wCAAwC;IACxC,GAAG,EAAE,MAAM,CAAA;IACX,iCAAiC;IACjC,WAAW,EAAE,MAAM,CAAA;IACnB,4BAA4B;IAC5B,SAAS,EAAE,MAAM,CAAA;IACjB,qBAAqB;IACrB,MAAM,EAAE,UAAU,CAAA;IAClB,+CAA+C;IAC/C,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,+BAA+B;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,iCAAiC;IACjC,aAAa,EAAE,OAAO,CAAA;IACtB,8BAA8B;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,iCAAiC;IACjC,OAAO,EAAE,MAAM,CAAA;IACf,iCAAiC;IACjC,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,6BAA6B;IAC7B,MAAM,EAAE,KAAK,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CACjD"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @fileoverview TaskRunner Type Definitions and Constants
|
|
3
|
+
* @module @skillsmith/core/services/TaskRunner.types
|
|
4
|
+
* @see SMI-1662: TaskRunner - Background Task Timeout Management
|
|
5
|
+
* @see SMI-2741: Split from TaskRunner.ts to meet 500-line standard
|
|
6
|
+
*/
|
|
7
|
+
// ============================================================================
|
|
8
|
+
// Constants
|
|
9
|
+
// ============================================================================
|
|
10
|
+
/**
|
|
11
|
+
* Default timeout: 10 minutes (600000ms)
|
|
12
|
+
*/
|
|
13
|
+
export const DEFAULT_TASK_TIMEOUT_MS = 600000;
|
|
14
|
+
/**
|
|
15
|
+
* Grace period before SIGKILL after SIGTERM: 5 seconds
|
|
16
|
+
*/
|
|
17
|
+
export const SIGKILL_GRACE_PERIOD_MS = 5000;
|
|
18
|
+
/**
|
|
19
|
+
* Warning threshold: 80% of timeout
|
|
20
|
+
*/
|
|
21
|
+
export const WARNING_THRESHOLD_RATIO = 0.8;
|
|
22
|
+
//# sourceMappingURL=TaskRunner.types.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"TaskRunner.types.js","sourceRoot":"","sources":["../../../src/services/TaskRunner.types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,+EAA+E;AAC/E,YAAY;AACZ,+EAA+E;AAE/E;;GAEG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAA;AAE7C;;GAEG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,CAAA;AAE3C;;GAEG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAG,CAAA"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* SMI-2754: TaskRunner Process Management Tests
|
|
3
|
+
*
|
|
4
|
+
* Tests for gracefulShutdown and killProcess covering all uncovered branches:
|
|
5
|
+
* 1. gracefulShutdown: SIGTERM succeeds, process exits before grace (SIGKILL check throws ESRCH)
|
|
6
|
+
* 2. gracefulShutdown: SIGTERM throws ESRCH → early return
|
|
7
|
+
* 3. gracefulShutdown: SIGTERM succeeds, process still alive after grace → SIGKILL sent
|
|
8
|
+
* 4. killProcess: SIGKILL succeeds (no throw)
|
|
9
|
+
* 5. killProcess: throws ESRCH → silently swallowed
|
|
10
|
+
* 6. killProcess: throws non-ESRCH error → re-throws
|
|
11
|
+
*/
|
|
12
|
+
export {};
|
|
13
|
+
//# sourceMappingURL=TaskRunner.process.test.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"TaskRunner.process.test.d.ts","sourceRoot":"","sources":["../../../../src/services/__tests__/TaskRunner.process.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG"}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* SMI-2754: TaskRunner Process Management Tests
|
|
3
|
+
*
|
|
4
|
+
* Tests for gracefulShutdown and killProcess covering all uncovered branches:
|
|
5
|
+
* 1. gracefulShutdown: SIGTERM succeeds, process exits before grace (SIGKILL check throws ESRCH)
|
|
6
|
+
* 2. gracefulShutdown: SIGTERM throws ESRCH → early return
|
|
7
|
+
* 3. gracefulShutdown: SIGTERM succeeds, process still alive after grace → SIGKILL sent
|
|
8
|
+
* 4. killProcess: SIGKILL succeeds (no throw)
|
|
9
|
+
* 5. killProcess: throws ESRCH → silently swallowed
|
|
10
|
+
* 6. killProcess: throws non-ESRCH error → re-throws
|
|
11
|
+
*/
|
|
12
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
13
|
+
import { gracefulShutdown, killProcess } from '../TaskRunner.process.js';
|
|
14
|
+
import { SIGKILL_GRACE_PERIOD_MS } from '../TaskRunner.types.js';
|
|
15
|
+
describe('gracefulShutdown', () => {
|
|
16
|
+
beforeEach(() => {
|
|
17
|
+
vi.useFakeTimers();
|
|
18
|
+
});
|
|
19
|
+
afterEach(() => {
|
|
20
|
+
vi.restoreAllMocks();
|
|
21
|
+
vi.useRealTimers();
|
|
22
|
+
});
|
|
23
|
+
it('sends SIGTERM and does NOT send SIGKILL when process exits before grace period', async () => {
|
|
24
|
+
const killSpy = vi.spyOn(process, 'kill').mockImplementation((pid, signal) => {
|
|
25
|
+
if (signal === 'SIGTERM')
|
|
26
|
+
return true;
|
|
27
|
+
// signal === 0 check: process already dead
|
|
28
|
+
const err = Object.assign(new Error('ESRCH'), { code: 'ESRCH' });
|
|
29
|
+
throw err;
|
|
30
|
+
});
|
|
31
|
+
const promise = gracefulShutdown(12345);
|
|
32
|
+
vi.advanceTimersByTime(SIGKILL_GRACE_PERIOD_MS + 100);
|
|
33
|
+
await promise;
|
|
34
|
+
expect(killSpy).toHaveBeenCalledWith(12345, 'SIGTERM');
|
|
35
|
+
// SIGKILL should NOT have been called because signal-0 threw ESRCH
|
|
36
|
+
const sigkillCalls = killSpy.mock.calls.filter(([, sig]) => sig === 'SIGKILL');
|
|
37
|
+
expect(sigkillCalls).toHaveLength(0);
|
|
38
|
+
});
|
|
39
|
+
it('returns early without sleeping when SIGTERM itself throws ESRCH', async () => {
|
|
40
|
+
const err = Object.assign(new Error('ESRCH'), { code: 'ESRCH' });
|
|
41
|
+
const killSpy = vi.spyOn(process, 'kill').mockImplementation(() => {
|
|
42
|
+
throw err;
|
|
43
|
+
});
|
|
44
|
+
await gracefulShutdown(99999);
|
|
45
|
+
// Only one call (SIGTERM), no grace period wait, no SIGKILL
|
|
46
|
+
expect(killSpy).toHaveBeenCalledTimes(1);
|
|
47
|
+
expect(killSpy).toHaveBeenCalledWith(99999, 'SIGTERM');
|
|
48
|
+
});
|
|
49
|
+
it('sends SIGKILL when process is still alive after grace period', async () => {
|
|
50
|
+
const killSpy = vi.spyOn(process, 'kill').mockImplementation((pid, signal) => {
|
|
51
|
+
if (signal === 'SIGTERM')
|
|
52
|
+
return true;
|
|
53
|
+
if (signal === 0)
|
|
54
|
+
return true; // process still alive
|
|
55
|
+
if (signal === 'SIGKILL')
|
|
56
|
+
return true;
|
|
57
|
+
return true;
|
|
58
|
+
});
|
|
59
|
+
const promise = gracefulShutdown(55555);
|
|
60
|
+
vi.advanceTimersByTime(SIGKILL_GRACE_PERIOD_MS + 100);
|
|
61
|
+
await promise;
|
|
62
|
+
expect(killSpy).toHaveBeenCalledWith(55555, 'SIGTERM');
|
|
63
|
+
expect(killSpy).toHaveBeenCalledWith(55555, 0);
|
|
64
|
+
expect(killSpy).toHaveBeenCalledWith(55555, 'SIGKILL');
|
|
65
|
+
});
|
|
66
|
+
});
|
|
67
|
+
describe('killProcess', () => {
|
|
68
|
+
afterEach(() => {
|
|
69
|
+
vi.restoreAllMocks();
|
|
70
|
+
});
|
|
71
|
+
it('calls process.kill with SIGKILL and resolves without error', async () => {
|
|
72
|
+
const killSpy = vi.spyOn(process, 'kill').mockImplementation(() => true);
|
|
73
|
+
await expect(killProcess(11111)).resolves.toBeUndefined();
|
|
74
|
+
expect(killSpy).toHaveBeenCalledWith(11111, 'SIGKILL');
|
|
75
|
+
});
|
|
76
|
+
it('silently swallows ESRCH error (process already dead)', async () => {
|
|
77
|
+
const err = Object.assign(new Error('ESRCH'), { code: 'ESRCH' });
|
|
78
|
+
vi.spyOn(process, 'kill').mockImplementation(() => {
|
|
79
|
+
throw err;
|
|
80
|
+
});
|
|
81
|
+
await expect(killProcess(22222)).resolves.toBeUndefined();
|
|
82
|
+
});
|
|
83
|
+
it('re-throws non-ESRCH errors', async () => {
|
|
84
|
+
const err = Object.assign(new Error('EPERM'), { code: 'EPERM' });
|
|
85
|
+
vi.spyOn(process, 'kill').mockImplementation(() => {
|
|
86
|
+
throw err;
|
|
87
|
+
});
|
|
88
|
+
await expect(killProcess(33333)).rejects.toThrow('EPERM');
|
|
89
|
+
});
|
|
90
|
+
});
|
|
91
|
+
//# sourceMappingURL=TaskRunner.process.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"TaskRunner.process.test.js","sourceRoot":"","sources":["../../../../src/services/__tests__/TaskRunner.process.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* SMI-2269: Quarantine Service with Authentication
|
|
3
3
|
* SMI-2277: Persist multi-approval state to database
|
|
4
|
+
* @see SMI-2741: Multi-approval workflow split to QuarantineService.multiapproval.ts
|
|
4
5
|
*
|
|
5
6
|
* Service layer for quarantine operations that enforces authentication
|
|
6
7
|
* and authorization. Wraps QuarantineRepository with security controls.
|
|
@@ -22,6 +23,8 @@ import type { QuarantineRepository } from '../../repositories/quarantine/index.j
|
|
|
22
23
|
import type { ApprovalRepository } from '../../repositories/quarantine/ApprovalRepository.js';
|
|
23
24
|
import type { AuditLogger } from '../../security/AuditLogger.js';
|
|
24
25
|
import type { AuthenticatedSession, AuthenticatedReviewInput, AuthenticatedReviewResult, MultiApprovalStatus } from './types.js';
|
|
26
|
+
export { handleMaliciousApproval, buildMultiApprovalStatus, } from './QuarantineService.multiapproval.js';
|
|
27
|
+
export { MALICIOUS_APPROVAL_COUNT, MULTI_APPROVAL_TIMEOUT_MS, } from './QuarantineService.multiapproval.js';
|
|
25
28
|
/**
|
|
26
29
|
* Quarantine Service with Authentication
|
|
27
30
|
*
|
|
@@ -97,23 +100,6 @@ export declare class QuarantineService {
|
|
|
97
100
|
* @throws QuarantineServiceError on auth/permission failure
|
|
98
101
|
*/
|
|
99
102
|
review(session: AuthenticatedSession, quarantineId: string, input: AuthenticatedReviewInput): AuthenticatedReviewResult;
|
|
100
|
-
/**
|
|
101
|
-
* Handle approval for MALICIOUS severity skills
|
|
102
|
-
*
|
|
103
|
-
* MALICIOUS severity requires multiple reviewers to approve
|
|
104
|
-
* before a skill can be unquarantined. This prevents single
|
|
105
|
-
* reviewer compromise from allowing malicious skills.
|
|
106
|
-
*
|
|
107
|
-
* Approval state is persisted to the database (SMI-2277) so
|
|
108
|
-
* pending approvals survive service restarts.
|
|
109
|
-
*
|
|
110
|
-
* @param session - Authenticated session
|
|
111
|
-
* @param quarantineId - Quarantine entry ID
|
|
112
|
-
* @param skillId - Skill ID
|
|
113
|
-
* @param input - Review input
|
|
114
|
-
* @returns Review result with multi-approval status
|
|
115
|
-
*/
|
|
116
|
-
private handleMaliciousApproval;
|
|
117
103
|
/**
|
|
118
104
|
* Get pending multi-approval status for a quarantine entry
|
|
119
105
|
*
|
|
@@ -146,12 +132,5 @@ export declare class QuarantineService {
|
|
|
146
132
|
* @returns Whether the entry was deleted
|
|
147
133
|
*/
|
|
148
134
|
delete(session: AuthenticatedSession, id: string): boolean;
|
|
149
|
-
/**
|
|
150
|
-
* Build a MultiApprovalStatus from database rows
|
|
151
|
-
*
|
|
152
|
-
* Converts persisted approval entries into the MultiApprovalStatus
|
|
153
|
-
* interface expected by consumers.
|
|
154
|
-
*/
|
|
155
|
-
private buildMultiApprovalStatus;
|
|
156
135
|
}
|
|
157
136
|
//# sourceMappingURL=QuarantineService.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QuarantineService.d.ts","sourceRoot":"","sources":["../../../../src/services/quarantine/QuarantineService.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"QuarantineService.d.ts","sourceRoot":"","sources":["../../../../src/services/quarantine/QuarantineService.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAA;AAClF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qDAAqD,CAAA;AAC7F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,KAAK,EACV,oBAAoB,EACpB,wBAAwB,EACxB,yBAAyB,EACzB,mBAAmB,EACpB,MAAM,YAAY,CAAA;AAQnB,OAAO,EACL,uBAAuB,EACvB,wBAAwB,GACzB,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EACL,wBAAwB,EACxB,yBAAyB,GAC1B,MAAM,sCAAsC,CAAA;AAM7C;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAFX,UAAU,EAAE,oBAAoB,EAChC,kBAAkB,EAAE,kBAAkB,EACtC,WAAW,EAAE,WAAW;IAO3C;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,oBAAoB,EAAE,EAAE,EAAE,MAAM;IAKlD;;;;;;OAMG;IACH,aAAa,CAAC,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM;IAK5D;;;;;;OAMG;IACH,OAAO,CAAC,OAAO,EAAE,oBAAoB,EAAE,MAAM,CAAC,EAAE,UAAU,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAK9F;;;;;OAKG;IACH,QAAQ,CAAC,OAAO,EAAE,oBAAoB;IAStC;;;;;;;;;;;;;;;OAeG;IACH,MAAM,CACJ,OAAO,EAAE,oBAAoB,EAC7B,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,wBAAwB,GAC9B,yBAAyB;IA4F5B;;;;;;OAMG;IACH,sBAAsB,CACpB,OAAO,EAAE,oBAAoB,EAC7B,YAAY,EAAE,MAAM,GACnB,mBAAmB,GAAG,IAAI;IAW7B;;;;;;OAMG;IACH,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO;IA8BjF;;;;;;OAMG;IACH,MAAM,CAAC,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,UAAU,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAK1F;;;;;;OAMG;IACH,MAAM,CAAC,OAAO,EAAE,oBAAoB,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO;CAQ3D"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* SMI-2269: Quarantine Service with Authentication
|
|
3
3
|
* SMI-2277: Persist multi-approval state to database
|
|
4
|
+
* @see SMI-2741: Multi-approval workflow split to QuarantineService.multiapproval.ts
|
|
4
5
|
*
|
|
5
6
|
* Service layer for quarantine operations that enforces authentication
|
|
6
7
|
* and authorization. Wraps QuarantineRepository with security controls.
|
|
@@ -19,17 +20,10 @@
|
|
|
19
20
|
* @module @skillsmith/core/services/quarantine/QuarantineService
|
|
20
21
|
*/
|
|
21
22
|
import { QuarantineServiceError, requirePermission } from './types.js';
|
|
22
|
-
|
|
23
|
-
//
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
* Number of approvals required for MALICIOUS severity reviews
|
|
27
|
-
*/
|
|
28
|
-
const MALICIOUS_APPROVAL_COUNT = 2;
|
|
29
|
-
/**
|
|
30
|
-
* Multi-approval timeout in milliseconds (24 hours)
|
|
31
|
-
*/
|
|
32
|
-
const MULTI_APPROVAL_TIMEOUT_MS = 24 * 60 * 60 * 1000;
|
|
23
|
+
import { handleMaliciousApproval, buildMultiApprovalStatus, } from './QuarantineService.multiapproval.js';
|
|
24
|
+
// Re-export multi-approval functions for public API
|
|
25
|
+
export { handleMaliciousApproval, buildMultiApprovalStatus, } from './QuarantineService.multiapproval.js';
|
|
26
|
+
export { MALICIOUS_APPROVAL_COUNT, MULTI_APPROVAL_TIMEOUT_MS, } from './QuarantineService.multiapproval.js';
|
|
33
27
|
// ============================================================================
|
|
34
28
|
// Service Implementation
|
|
35
29
|
// ============================================================================
|
|
@@ -145,7 +139,7 @@ export class QuarantineService {
|
|
|
145
139
|
}
|
|
146
140
|
// For MALICIOUS severity, require multi-approval workflow
|
|
147
141
|
if (entry.severity === 'MALICIOUS' && input.reviewStatus === 'approved') {
|
|
148
|
-
return
|
|
142
|
+
return handleMaliciousApproval(session, quarantineId, entry.skillId, input, this.repository, this.approvalRepository, this.auditLogger);
|
|
149
143
|
}
|
|
150
144
|
// For MALICIOUS severity rejection or non-MALICIOUS, check elevated permission
|
|
151
145
|
if (entry.severity === 'MALICIOUS') {
|
|
@@ -197,171 +191,8 @@ export class QuarantineService {
|
|
|
197
191
|
};
|
|
198
192
|
}
|
|
199
193
|
// ==========================================================================
|
|
200
|
-
// Multi-Approval
|
|
194
|
+
// Multi-Approval Status Operations
|
|
201
195
|
// ==========================================================================
|
|
202
|
-
/**
|
|
203
|
-
* Handle approval for MALICIOUS severity skills
|
|
204
|
-
*
|
|
205
|
-
* MALICIOUS severity requires multiple reviewers to approve
|
|
206
|
-
* before a skill can be unquarantined. This prevents single
|
|
207
|
-
* reviewer compromise from allowing malicious skills.
|
|
208
|
-
*
|
|
209
|
-
* Approval state is persisted to the database (SMI-2277) so
|
|
210
|
-
* pending approvals survive service restarts.
|
|
211
|
-
*
|
|
212
|
-
* @param session - Authenticated session
|
|
213
|
-
* @param quarantineId - Quarantine entry ID
|
|
214
|
-
* @param skillId - Skill ID
|
|
215
|
-
* @param input - Review input
|
|
216
|
-
* @returns Review result with multi-approval status
|
|
217
|
-
*/
|
|
218
|
-
handleMaliciousApproval(session, quarantineId, skillId, input) {
|
|
219
|
-
// Require elevated permission for MALICIOUS review
|
|
220
|
-
requirePermission(session, 'quarantine:review_malicious');
|
|
221
|
-
// Check if this reviewer already approved (database-backed)
|
|
222
|
-
if (this.approvalRepository.hasReviewerApproved(quarantineId, session.userId)) {
|
|
223
|
-
// Retrieve existing approval for error details
|
|
224
|
-
const existingApprovals = this.approvalRepository.getPendingApprovals(quarantineId);
|
|
225
|
-
const existing = existingApprovals.find((a) => a.reviewerId === session.userId);
|
|
226
|
-
throw new QuarantineServiceError('You have already approved this entry', 'ALREADY_REVIEWED', {
|
|
227
|
-
quarantineId,
|
|
228
|
-
previousApprovalAt: existing?.createdAt ?? 'unknown',
|
|
229
|
-
});
|
|
230
|
-
}
|
|
231
|
-
// Check for approval timeout
|
|
232
|
-
const startTime = this.approvalRepository.getWorkflowStartTime(quarantineId);
|
|
233
|
-
if (startTime) {
|
|
234
|
-
const timeSinceStart = Date.now() - new Date(startTime).getTime();
|
|
235
|
-
if (timeSinceStart > MULTI_APPROVAL_TIMEOUT_MS) {
|
|
236
|
-
// Capture existing approvals before clearing for audit
|
|
237
|
-
const expiredApprovals = this.approvalRepository.getPendingApprovals(quarantineId);
|
|
238
|
-
// Reset approval workflow
|
|
239
|
-
this.approvalRepository.clearApprovals(quarantineId);
|
|
240
|
-
// Log timeout event so cleared reviewer work is auditable
|
|
241
|
-
this.auditLogger.log({
|
|
242
|
-
event_type: 'quarantine_multi_approval_timeout',
|
|
243
|
-
actor: 'system',
|
|
244
|
-
resource: skillId,
|
|
245
|
-
action: 'timeout',
|
|
246
|
-
result: 'success',
|
|
247
|
-
metadata: {
|
|
248
|
-
quarantineId,
|
|
249
|
-
timeoutMs: MULTI_APPROVAL_TIMEOUT_MS,
|
|
250
|
-
expiredApprovals: expiredApprovals.map((a) => ({
|
|
251
|
-
reviewerId: a.reviewerId,
|
|
252
|
-
email: a.reviewerEmail,
|
|
253
|
-
approvedAt: a.createdAt,
|
|
254
|
-
})),
|
|
255
|
-
triggeredBy: {
|
|
256
|
-
userId: session.userId,
|
|
257
|
-
email: session.email,
|
|
258
|
-
},
|
|
259
|
-
},
|
|
260
|
-
});
|
|
261
|
-
throw new QuarantineServiceError('Multi-approval workflow timed out. Please start again.', 'INVALID_INPUT', { quarantineId, timeoutMs: MULTI_APPROVAL_TIMEOUT_MS });
|
|
262
|
-
}
|
|
263
|
-
}
|
|
264
|
-
// Record this approval in the database
|
|
265
|
-
this.approvalRepository.recordApproval({
|
|
266
|
-
skillId: quarantineId,
|
|
267
|
-
reviewerId: session.userId,
|
|
268
|
-
reviewerEmail: session.email,
|
|
269
|
-
decision: 'approved',
|
|
270
|
-
reason: input.reviewNotes,
|
|
271
|
-
requiredApprovals: MALICIOUS_APPROVAL_COUNT,
|
|
272
|
-
});
|
|
273
|
-
// Get current approval count and all pending approvals
|
|
274
|
-
const pendingApprovals = this.approvalRepository.getPendingApprovals(quarantineId);
|
|
275
|
-
const approvalCount = pendingApprovals.filter((a) => a.decision === 'approved').length;
|
|
276
|
-
// Build the multi-approval status from database state
|
|
277
|
-
const approvalStatus = this.buildMultiApprovalStatus(quarantineId, pendingApprovals);
|
|
278
|
-
// Log the approval
|
|
279
|
-
this.auditLogger.log({
|
|
280
|
-
event_type: 'quarantine_multi_approval',
|
|
281
|
-
actor: 'reviewer',
|
|
282
|
-
resource: skillId,
|
|
283
|
-
action: 'approve',
|
|
284
|
-
result: 'success',
|
|
285
|
-
metadata: {
|
|
286
|
-
quarantineId,
|
|
287
|
-
approvalNumber: approvalCount,
|
|
288
|
-
requiredApprovals: MALICIOUS_APPROVAL_COUNT,
|
|
289
|
-
reviewer: {
|
|
290
|
-
userId: session.userId,
|
|
291
|
-
email: session.email,
|
|
292
|
-
},
|
|
293
|
-
},
|
|
294
|
-
});
|
|
295
|
-
// Check if we have enough approvals
|
|
296
|
-
if (approvalCount >= MALICIOUS_APPROVAL_COUNT) {
|
|
297
|
-
// Mark approvals as complete in database
|
|
298
|
-
this.approvalRepository.markComplete(quarantineId);
|
|
299
|
-
approvalStatus.isComplete = true;
|
|
300
|
-
approvalStatus.completedAt = new Date();
|
|
301
|
-
// Perform the actual review
|
|
302
|
-
const approverEmails = pendingApprovals
|
|
303
|
-
.filter((a) => a.decision === 'approved')
|
|
304
|
-
.map((a) => a.reviewerEmail);
|
|
305
|
-
const reviewResult = this.repository.review(quarantineId, {
|
|
306
|
-
reviewedBy: approverEmails.join(', '),
|
|
307
|
-
reviewStatus: 'approved',
|
|
308
|
-
reviewNotes: `Multi-approval complete: ${approvalCount} reviewers approved. ${input.reviewNotes || ''}`,
|
|
309
|
-
});
|
|
310
|
-
// Log completion
|
|
311
|
-
this.auditLogger.log({
|
|
312
|
-
event_type: 'quarantine_multi_approval_complete',
|
|
313
|
-
actor: 'reviewer',
|
|
314
|
-
resource: skillId,
|
|
315
|
-
action: 'complete',
|
|
316
|
-
result: 'success',
|
|
317
|
-
metadata: {
|
|
318
|
-
quarantineId,
|
|
319
|
-
approvals: pendingApprovals
|
|
320
|
-
.filter((a) => a.decision === 'approved')
|
|
321
|
-
.map((a) => ({
|
|
322
|
-
reviewerId: a.reviewerId,
|
|
323
|
-
email: a.reviewerEmail,
|
|
324
|
-
approvedAt: a.createdAt,
|
|
325
|
-
})),
|
|
326
|
-
},
|
|
327
|
-
});
|
|
328
|
-
return {
|
|
329
|
-
success: true,
|
|
330
|
-
approved: true,
|
|
331
|
-
skillId,
|
|
332
|
-
severity: 'MALICIOUS',
|
|
333
|
-
canImport: reviewResult?.canImport ?? false,
|
|
334
|
-
warnings: [
|
|
335
|
-
'MALICIOUS skill approved through multi-approval workflow',
|
|
336
|
-
`Approved by: ${approverEmails.join(', ')}`,
|
|
337
|
-
],
|
|
338
|
-
reviewedBy: {
|
|
339
|
-
userId: session.userId,
|
|
340
|
-
email: session.email,
|
|
341
|
-
displayName: session.displayName,
|
|
342
|
-
},
|
|
343
|
-
multiApprovalStatus: approvalStatus,
|
|
344
|
-
};
|
|
345
|
-
}
|
|
346
|
-
// Need more approvals
|
|
347
|
-
return {
|
|
348
|
-
success: true,
|
|
349
|
-
approved: false,
|
|
350
|
-
skillId,
|
|
351
|
-
severity: 'MALICIOUS',
|
|
352
|
-
canImport: false,
|
|
353
|
-
warnings: [
|
|
354
|
-
`Multi-approval in progress: ${approvalCount}/${MALICIOUS_APPROVAL_COUNT} approvals received`,
|
|
355
|
-
`Requires ${MALICIOUS_APPROVAL_COUNT - approvalCount} more approval(s)`,
|
|
356
|
-
],
|
|
357
|
-
reviewedBy: {
|
|
358
|
-
userId: session.userId,
|
|
359
|
-
email: session.email,
|
|
360
|
-
displayName: session.displayName,
|
|
361
|
-
},
|
|
362
|
-
multiApprovalStatus: approvalStatus,
|
|
363
|
-
};
|
|
364
|
-
}
|
|
365
196
|
/**
|
|
366
197
|
* Get pending multi-approval status for a quarantine entry
|
|
367
198
|
*
|
|
@@ -375,7 +206,7 @@ export class QuarantineService {
|
|
|
375
206
|
if (pendingApprovals.length === 0) {
|
|
376
207
|
return null;
|
|
377
208
|
}
|
|
378
|
-
return
|
|
209
|
+
return buildMultiApprovalStatus(quarantineId, pendingApprovals);
|
|
379
210
|
}
|
|
380
211
|
/**
|
|
381
212
|
* Cancel a pending multi-approval workflow
|
|
@@ -432,33 +263,5 @@ export class QuarantineService {
|
|
|
432
263
|
this.approvalRepository.clearApprovals(id);
|
|
433
264
|
return this.repository.delete(id);
|
|
434
265
|
}
|
|
435
|
-
// ==========================================================================
|
|
436
|
-
// Private Helpers
|
|
437
|
-
// ==========================================================================
|
|
438
|
-
/**
|
|
439
|
-
* Build a MultiApprovalStatus from database rows
|
|
440
|
-
*
|
|
441
|
-
* Converts persisted approval entries into the MultiApprovalStatus
|
|
442
|
-
* interface expected by consumers.
|
|
443
|
-
*/
|
|
444
|
-
buildMultiApprovalStatus(quarantineId, approvals) {
|
|
445
|
-
const currentApprovals = approvals.map((a) => ({
|
|
446
|
-
reviewerId: a.reviewerId,
|
|
447
|
-
reviewerEmail: a.reviewerEmail,
|
|
448
|
-
approvedAt: new Date(a.createdAt),
|
|
449
|
-
notes: a.reason ?? undefined,
|
|
450
|
-
}));
|
|
451
|
-
const startedAt = approvals.length > 0 ? new Date(approvals[0].createdAt) : new Date();
|
|
452
|
-
const isComplete = approvals.some((a) => a.isComplete);
|
|
453
|
-
const completedEntry = approvals.find((a) => a.completedAt);
|
|
454
|
-
return {
|
|
455
|
-
quarantineId,
|
|
456
|
-
requiredApprovals: MALICIOUS_APPROVAL_COUNT,
|
|
457
|
-
currentApprovals,
|
|
458
|
-
isComplete,
|
|
459
|
-
startedAt,
|
|
460
|
-
completedAt: completedEntry ? new Date(completedEntry.completedAt) : undefined,
|
|
461
|
-
};
|
|
462
|
-
}
|
|
463
266
|
}
|
|
464
267
|
//# sourceMappingURL=QuarantineService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QuarantineService.js","sourceRoot":"","sources":["../../../../src/services/quarantine/QuarantineService.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"QuarantineService.js","sourceRoot":"","sources":["../../../../src/services/quarantine/QuarantineService.ts"],"names":[],"mappings":"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"}
|