@intrect/openswarm 0.17.1 → 0.17.3
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 +21 -5
- package/config.example.yaml +18 -0
- package/dist/adapters/agenticLoop.d.ts +2 -0
- package/dist/adapters/agenticLoop.d.ts.map +1 -1
- package/dist/adapters/agenticLoop.js +7 -4
- package/dist/adapters/agenticLoop.js.map +1 -1
- package/dist/adapters/base.d.ts.map +1 -1
- package/dist/adapters/base.js +9 -0
- package/dist/adapters/base.js.map +1 -1
- package/dist/adapters/claude.d.ts.map +1 -1
- package/dist/adapters/claude.js +6 -3
- package/dist/adapters/claude.js.map +1 -1
- package/dist/adapters/codex.d.ts.map +1 -1
- package/dist/adapters/codex.js +3 -2
- package/dist/adapters/codex.js.map +1 -1
- package/dist/adapters/codexResponses.d.ts +2 -1
- package/dist/adapters/codexResponses.d.ts.map +1 -1
- package/dist/adapters/codexResponses.js +35 -31
- package/dist/adapters/codexResponses.js.map +1 -1
- package/dist/adapters/errorClassification.d.ts +11 -0
- package/dist/adapters/errorClassification.d.ts.map +1 -1
- package/dist/adapters/errorClassification.js +22 -0
- package/dist/adapters/errorClassification.js.map +1 -1
- package/dist/adapters/gpt.d.ts.map +1 -1
- package/dist/adapters/gpt.js +2 -1
- package/dist/adapters/gpt.js.map +1 -1
- package/dist/adapters/local.d.ts.map +1 -1
- package/dist/adapters/local.js +2 -1
- package/dist/adapters/local.js.map +1 -1
- package/dist/adapters/openrouter.d.ts.map +1 -1
- package/dist/adapters/openrouter.js +2 -1
- package/dist/adapters/openrouter.js.map +1 -1
- package/dist/adapters/processRegistry.d.ts.map +1 -1
- package/dist/adapters/processRegistry.js +8 -0
- package/dist/adapters/processRegistry.js.map +1 -1
- package/dist/adapters/types.d.ts +2 -0
- package/dist/adapters/types.d.ts.map +1 -1
- package/dist/agents/pairPipeline.d.ts +10 -139
- package/dist/agents/pairPipeline.d.ts.map +1 -1
- package/dist/agents/pairPipeline.js +127 -35
- package/dist/agents/pairPipeline.js.map +1 -1
- package/dist/agents/pairPipelineTypes.d.ts +109 -0
- package/dist/agents/pairPipelineTypes.d.ts.map +1 -0
- package/dist/agents/pairPipelineTypes.js +2 -0
- package/dist/agents/pairPipelineTypes.js.map +1 -0
- package/dist/agents/pipelineGuards.d.ts.map +1 -1
- package/dist/agents/pipelineGuards.js +346 -0
- package/dist/agents/pipelineGuards.js.map +1 -1
- package/dist/agents/pipelineTaskPrefix.d.ts +3 -0
- package/dist/agents/pipelineTaskPrefix.d.ts.map +1 -0
- package/dist/agents/pipelineTaskPrefix.js +16 -0
- package/dist/agents/pipelineTaskPrefix.js.map +1 -0
- package/dist/agents/reflection.d.ts +1 -1
- package/dist/agents/reflection.d.ts.map +1 -1
- package/dist/agents/reflection.js +3 -1
- package/dist/agents/reflection.js.map +1 -1
- package/dist/agents/reviewer.d.ts +6 -0
- package/dist/agents/reviewer.d.ts.map +1 -1
- package/dist/agents/reviewer.js +4 -1
- package/dist/agents/reviewer.js.map +1 -1
- package/dist/agents/stageErrorClassification.d.ts +16 -0
- package/dist/agents/stageErrorClassification.d.ts.map +1 -0
- package/dist/agents/stageErrorClassification.js +38 -0
- package/dist/agents/stageErrorClassification.js.map +1 -0
- package/dist/agents/stageModelResolver.d.ts +8 -0
- package/dist/agents/stageModelResolver.d.ts.map +1 -0
- package/dist/agents/stageModelResolver.js +22 -0
- package/dist/agents/stageModelResolver.js.map +1 -0
- package/dist/agents/worker.d.ts +33 -0
- package/dist/agents/worker.d.ts.map +1 -1
- package/dist/agents/worker.js +62 -5
- package/dist/agents/worker.js.map +1 -1
- package/dist/agents/workerFanout.d.ts +38 -0
- package/dist/agents/workerFanout.d.ts.map +1 -0
- package/dist/agents/workerFanout.js +277 -0
- package/dist/agents/workerFanout.js.map +1 -0
- package/dist/agents/workerFanoutGate.d.ts +48 -0
- package/dist/agents/workerFanoutGate.d.ts.map +1 -0
- package/dist/agents/workerFanoutGate.js +146 -0
- package/dist/agents/workerFanoutGate.js.map +1 -0
- package/dist/agents/workerValidationEvidence.d.ts +5 -0
- package/dist/agents/workerValidationEvidence.d.ts.map +1 -0
- package/dist/agents/workerValidationEvidence.js +75 -0
- package/dist/agents/workerValidationEvidence.js.map +1 -0
- package/dist/auth/linearPkce.d.ts.map +1 -1
- package/dist/auth/linearPkce.js +1 -12
- package/dist/auth/linearPkce.js.map +1 -1
- package/dist/auth/oauthPkce.d.ts.map +1 -1
- package/dist/auth/oauthPkce.js +1 -14
- package/dist/auth/oauthPkce.js.map +1 -1
- package/dist/auth/oauthStore.d.ts.map +1 -1
- package/dist/auth/oauthStore.js +28 -2
- package/dist/auth/oauthStore.js.map +1 -1
- package/dist/auth/openBrowser.d.ts +2 -0
- package/dist/auth/openBrowser.d.ts.map +1 -0
- package/dist/auth/openBrowser.js +32 -0
- package/dist/auth/openBrowser.js.map +1 -0
- package/dist/auth/openrouterPkce.d.ts.map +1 -1
- package/dist/auth/openrouterPkce.js +1 -14
- package/dist/auth/openrouterPkce.js.map +1 -1
- package/dist/automation/autonomousRunner.d.ts +24 -6
- package/dist/automation/autonomousRunner.d.ts.map +1 -1
- package/dist/automation/autonomousRunner.js +242 -41
- package/dist/automation/autonomousRunner.js.map +1 -1
- package/dist/automation/backlogGrooming.d.ts +52 -0
- package/dist/automation/backlogGrooming.d.ts.map +1 -0
- package/dist/automation/backlogGrooming.js +231 -0
- package/dist/automation/backlogGrooming.js.map +1 -0
- package/dist/automation/runnerExecution.d.ts +1 -1
- package/dist/automation/runnerExecution.d.ts.map +1 -1
- package/dist/automation/runnerExecution.js +31 -9
- package/dist/automation/runnerExecution.js.map +1 -1
- package/dist/automation/runnerTypes.d.ts +3 -1
- package/dist/automation/runnerTypes.d.ts.map +1 -1
- package/dist/automation/taskSource.d.ts +6 -3
- package/dist/automation/taskSource.d.ts.map +1 -1
- package/dist/automation/taskSource.js +5 -0
- package/dist/automation/taskSource.js.map +1 -1
- package/dist/cli/daemon.d.ts +20 -3
- package/dist/cli/daemon.d.ts.map +1 -1
- package/dist/cli/daemon.js +42 -2
- package/dist/cli/daemon.js.map +1 -1
- package/dist/cli/fixBoard.d.ts +14 -0
- package/dist/cli/fixBoard.d.ts.map +1 -0
- package/dist/cli/fixBoard.js +32 -0
- package/dist/cli/fixBoard.js.map +1 -0
- package/dist/cli/fixCommand.d.ts +8 -0
- package/dist/cli/fixCommand.d.ts.map +1 -1
- package/dist/cli/fixCommand.js +47 -8
- package/dist/cli/fixCommand.js.map +1 -1
- package/dist/cli/memoryCommand.d.ts +37 -0
- package/dist/cli/memoryCommand.d.ts.map +1 -0
- package/dist/cli/memoryCommand.js +156 -0
- package/dist/cli/memoryCommand.js.map +1 -0
- package/dist/cli/reviewAudit.d.ts +68 -0
- package/dist/cli/reviewAudit.d.ts.map +1 -1
- package/dist/cli/reviewAudit.js +147 -4
- package/dist/cli/reviewAudit.js.map +1 -1
- package/dist/cli/reviewMaxCommand.d.ts +2 -0
- package/dist/cli/reviewMaxCommand.d.ts.map +1 -1
- package/dist/cli/reviewMaxCommand.js +61 -33
- package/dist/cli/reviewMaxCommand.js.map +1 -1
- package/dist/cli.js +68 -13
- package/dist/cli.js.map +1 -1
- package/dist/core/config.d.ts +413 -0
- package/dist/core/config.d.ts.map +1 -1
- package/dist/core/config.js +51 -5
- package/dist/core/config.js.map +1 -1
- package/dist/core/eventHub.d.ts +22 -0
- package/dist/core/eventHub.d.ts.map +1 -1
- package/dist/core/eventHub.js +1 -0
- package/dist/core/eventHub.js.map +1 -1
- package/dist/core/providerOverride.d.ts +9 -0
- package/dist/core/providerOverride.d.ts.map +1 -1
- package/dist/core/providerOverride.js +12 -0
- package/dist/core/providerOverride.js.map +1 -1
- package/dist/core/service.d.ts.map +1 -1
- package/dist/core/service.js +8 -2
- package/dist/core/service.js.map +1 -1
- package/dist/core/types.d.ts +61 -1
- package/dist/core/types.d.ts.map +1 -1
- package/dist/linear/linear.d.ts +2 -1
- package/dist/linear/linear.d.ts.map +1 -1
- package/dist/linear/linear.js +34 -12
- package/dist/linear/linear.js.map +1 -1
- package/dist/linear/projectUpdater.d.ts.map +1 -1
- package/dist/linear/projectUpdater.js +40 -13
- package/dist/linear/projectUpdater.js.map +1 -1
- package/dist/locale/prompts/en.d.ts.map +1 -1
- package/dist/locale/prompts/en.js +15 -5
- package/dist/locale/prompts/en.js.map +1 -1
- package/dist/locale/prompts/ko.d.ts.map +1 -1
- package/dist/locale/prompts/ko.js +15 -5
- package/dist/locale/prompts/ko.js.map +1 -1
- package/dist/mcp/mcpClient.d.ts.map +1 -1
- package/dist/mcp/mcpClient.js +85 -4
- package/dist/mcp/mcpClient.js.map +1 -1
- package/dist/memory/compaction.d.ts +2 -2
- package/dist/memory/compaction.d.ts.map +1 -1
- package/dist/memory/compaction.js +22 -17
- package/dist/memory/compaction.js.map +1 -1
- package/dist/memory/index.d.ts +3 -3
- package/dist/memory/index.js +3 -3
- package/dist/memory/memoryCore.d.ts +16 -27
- package/dist/memory/memoryCore.d.ts.map +1 -1
- package/dist/memory/memoryCore.js +160 -102
- package/dist/memory/memoryCore.js.map +1 -1
- package/dist/memory/memoryFilters.d.ts +8 -0
- package/dist/memory/memoryFilters.d.ts.map +1 -0
- package/dist/memory/memoryFilters.js +26 -0
- package/dist/memory/memoryFilters.js.map +1 -0
- package/dist/memory/memoryOps.d.ts +7 -23
- package/dist/memory/memoryOps.d.ts.map +1 -1
- package/dist/memory/memoryOps.js +54 -117
- package/dist/memory/memoryOps.js.map +1 -1
- package/dist/memory/repoKnowledge.d.ts.map +1 -1
- package/dist/memory/repoKnowledge.js +48 -3
- package/dist/memory/repoKnowledge.js.map +1 -1
- package/dist/notify/notifier.d.ts.map +1 -1
- package/dist/notify/notifier.js +23 -16
- package/dist/notify/notifier.js.map +1 -1
- package/dist/orchestration/conflictDetector.d.ts.map +1 -1
- package/dist/orchestration/conflictDetector.js +48 -12
- package/dist/orchestration/conflictDetector.js.map +1 -1
- package/dist/orchestration/taskParser.d.ts.map +1 -1
- package/dist/orchestration/taskParser.js +18 -7
- package/dist/orchestration/taskParser.js.map +1 -1
- package/dist/orchestration/taskScheduler.d.ts +5 -0
- package/dist/orchestration/taskScheduler.d.ts.map +1 -1
- package/dist/orchestration/taskScheduler.js +37 -12
- package/dist/orchestration/taskScheduler.js.map +1 -1
- package/dist/registry/bsDetector.d.ts.map +1 -1
- package/dist/registry/bsDetector.js +23 -3
- package/dist/registry/bsDetector.js.map +1 -1
- package/dist/registry/entityScanner.d.ts.map +1 -1
- package/dist/registry/entityScanner.js +10 -5
- package/dist/registry/entityScanner.js.map +1 -1
- package/dist/registry/graphql/resolvers.d.ts +1 -1
- package/dist/registry/graphql/resolvers.d.ts.map +1 -1
- package/dist/registry/graphql/resolvers.js +92 -15
- package/dist/registry/graphql/resolvers.js.map +1 -1
- package/dist/registry/memoryBridge.js +4 -4
- package/dist/registry/memoryBridge.js.map +1 -1
- package/dist/registry/sqliteStore.d.ts +1 -1
- package/dist/registry/sqliteStore.d.ts.map +1 -1
- package/dist/registry/sqliteStore.js +20 -5
- package/dist/registry/sqliteStore.js.map +1 -1
- package/dist/support/chatMemory.js +1 -1
- package/dist/support/chatMemory.js.map +1 -1
- package/dist/support/dashboardHtml.d.ts +1 -1
- package/dist/support/dashboardHtml.d.ts.map +1 -1
- package/dist/support/dashboardHtml.js +12 -0
- package/dist/support/dashboardHtml.js.map +1 -1
- package/dist/support/gitTracker.d.ts +30 -3
- package/dist/support/gitTracker.d.ts.map +1 -1
- package/dist/support/gitTracker.js +108 -29
- package/dist/support/gitTracker.js.map +1 -1
- package/dist/support/projectMapper.d.ts.map +1 -1
- package/dist/support/projectMapper.js +5 -0
- package/dist/support/projectMapper.js.map +1 -1
- package/dist/support/repoMetadata.d.ts +10 -0
- package/dist/support/repoMetadata.d.ts.map +1 -1
- package/dist/support/repoMetadata.js +31 -0
- package/dist/support/repoMetadata.js.map +1 -1
- package/dist/support/rollback.d.ts.map +1 -1
- package/dist/support/rollback.js +10 -3
- package/dist/support/rollback.js.map +1 -1
- package/dist/support/timeWindow.d.ts.map +1 -1
- package/dist/support/timeWindow.js +46 -40
- package/dist/support/timeWindow.js.map +1 -1
- package/dist/support/updateNotifier.d.ts +12 -0
- package/dist/support/updateNotifier.d.ts.map +1 -1
- package/dist/support/updateNotifier.js +71 -0
- package/dist/support/updateNotifier.js.map +1 -1
- package/dist/support/web.d.ts.map +1 -1
- package/dist/support/web.js +74 -8
- package/dist/support/web.js.map +1 -1
- package/dist/support/worktreeManager.d.ts +33 -0
- package/dist/support/worktreeManager.d.ts.map +1 -1
- package/dist/support/worktreeManager.js +172 -2
- package/dist/support/worktreeManager.js.map +1 -1
- package/dist/taskState/store.d.ts.map +1 -1
- package/dist/taskState/store.js +2 -3
- package/dist/taskState/store.js.map +1 -1
- package/dist/tui/App.js +1 -1
- package/dist/tui/App.js.map +1 -1
- package/dist/tui/chatModel.d.ts +2 -4
- package/dist/tui/chatModel.d.ts.map +1 -1
- package/dist/tui/chatModel.js +5 -10
- package/dist/tui/chatModel.js.map +1 -1
- package/dist/tui/components/AuditBoard.d.ts +3 -2
- package/dist/tui/components/AuditBoard.d.ts.map +1 -1
- package/dist/tui/components/AuditBoard.js +13 -4
- package/dist/tui/components/AuditBoard.js.map +1 -1
- package/dist/tui/components/ChatInput.js +1 -1
- package/dist/tui/components/ChatLog.js +1 -1
- package/dist/tui/components/ChatLog.js.map +1 -1
- package/dist/tui/components/DataTable.d.ts +3 -1
- package/dist/tui/components/DataTable.d.ts.map +1 -1
- package/dist/tui/components/DataTable.js +22 -4
- package/dist/tui/components/DataTable.js.map +1 -1
- package/dist/tui/components/LiveLog.js +1 -1
- package/dist/tui/components/LiveLog.js.map +1 -1
- package/dist/tui/components/StageTimeline.d.ts +1 -1
- package/dist/tui/components/StageTimeline.d.ts.map +1 -1
- package/dist/tui/components/StageTimeline.js +6 -3
- package/dist/tui/components/StageTimeline.js.map +1 -1
- package/dist/tui/components/SubagentTree.d.ts +6 -6
- package/dist/tui/components/SubagentTree.d.ts.map +1 -1
- package/dist/tui/components/SubagentTree.js +39 -7
- package/dist/tui/components/SubagentTree.js.map +1 -1
- package/dist/tui/eventCoalescer.d.ts +29 -0
- package/dist/tui/eventCoalescer.d.ts.map +1 -0
- package/dist/tui/eventCoalescer.js +56 -0
- package/dist/tui/eventCoalescer.js.map +1 -0
- package/dist/tui/hooks/useMonitor.d.ts +3 -1
- package/dist/tui/hooks/useMonitor.d.ts.map +1 -1
- package/dist/tui/hooks/useMonitor.js +17 -1
- package/dist/tui/hooks/useMonitor.js.map +1 -1
- package/dist/tui/hooks/usePipelineEvents.d.ts +1 -1
- package/dist/tui/hooks/usePipelineEvents.d.ts.map +1 -1
- package/dist/tui/hooks/usePipelineEvents.js +18 -4
- package/dist/tui/hooks/usePipelineEvents.js.map +1 -1
- package/dist/tui/hooks/useTerminalSize.d.ts.map +1 -1
- package/dist/tui/hooks/useTerminalSize.js +3 -1
- package/dist/tui/hooks/useTerminalSize.js.map +1 -1
- package/dist/tui/monitorApi.d.ts +4 -4
- package/dist/tui/monitorApi.d.ts.map +1 -1
- package/dist/tui/monitorApi.js +13 -7
- package/dist/tui/monitorApi.js.map +1 -1
- package/dist/tui/monitorRows.d.ts +41 -2
- package/dist/tui/monitorRows.d.ts.map +1 -1
- package/dist/tui/monitorRows.js +86 -7
- package/dist/tui/monitorRows.js.map +1 -1
- package/dist/tui/panels/ChatPanel.d.ts.map +1 -1
- package/dist/tui/panels/ChatPanel.js +70 -15
- package/dist/tui/panels/ChatPanel.js.map +1 -1
- package/dist/tui/panels/MonitorPanel.d.ts +2 -1
- package/dist/tui/panels/MonitorPanel.d.ts.map +1 -1
- package/dist/tui/panels/MonitorPanel.js +2 -2
- package/dist/tui/panels/MonitorPanel.js.map +1 -1
- package/dist/tui/panels/PipelinePanel.d.ts.map +1 -1
- package/dist/tui/panels/PipelinePanel.js +6 -1
- package/dist/tui/panels/PipelinePanel.js.map +1 -1
- package/dist/tui/pipelineEvents.d.ts +14 -0
- package/dist/tui/pipelineEvents.d.ts.map +1 -1
- package/dist/tui/pipelineEvents.js +89 -1
- package/dist/tui/pipelineEvents.js.map +1 -1
- package/dist/tui/sse.d.ts.map +1 -1
- package/dist/tui/sse.js +29 -3
- package/dist/tui/sse.js.map +1 -1
- package/dist/tui/subagentTree.d.ts +26 -3
- package/dist/tui/subagentTree.d.ts.map +1 -1
- package/dist/tui/subagentTree.js +89 -14
- package/dist/tui/subagentTree.js.map +1 -1
- package/package.json +1 -1
|
@@ -21,6 +21,16 @@ export const DEFAULT_TIME_WINDOW = {
|
|
|
21
21
|
restrictedDays: [1, 2, 3, 4, 5],
|
|
22
22
|
timezone: 'Asia/Seoul',
|
|
23
23
|
};
|
|
24
|
+
const DEFAULT_TIMEZONE = DEFAULT_TIME_WINDOW.timezone ?? 'Asia/Seoul';
|
|
25
|
+
const WEEKDAY_INDEX = {
|
|
26
|
+
Sun: 0,
|
|
27
|
+
Mon: 1,
|
|
28
|
+
Tue: 2,
|
|
29
|
+
Wed: 3,
|
|
30
|
+
Thu: 4,
|
|
31
|
+
Fri: 5,
|
|
32
|
+
Sat: 6,
|
|
33
|
+
};
|
|
24
34
|
/**
|
|
25
35
|
* Convert time string to minutes
|
|
26
36
|
* "09:30" -> 570
|
|
@@ -41,18 +51,25 @@ function isInTimeRange(currentMinutes, range) {
|
|
|
41
51
|
}
|
|
42
52
|
return currentMinutes >= start && currentMinutes <= end;
|
|
43
53
|
}
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
const
|
|
54
|
-
|
|
55
|
-
|
|
54
|
+
function getCurrentTimeParts(timezone) {
|
|
55
|
+
const resolvedTimezone = timezone || DEFAULT_TIMEZONE;
|
|
56
|
+
const parts = new Intl.DateTimeFormat('en-US', {
|
|
57
|
+
timeZone: resolvedTimezone,
|
|
58
|
+
weekday: 'short',
|
|
59
|
+
hour: '2-digit',
|
|
60
|
+
minute: '2-digit',
|
|
61
|
+
hourCycle: 'h23',
|
|
62
|
+
}).formatToParts(new Date());
|
|
63
|
+
const values = Object.fromEntries(parts.map((part) => [part.type, part.value]));
|
|
64
|
+
const hours = Number(values.hour);
|
|
65
|
+
const minutes = Number(values.minute);
|
|
66
|
+
const day = WEEKDAY_INDEX[values.weekday];
|
|
67
|
+
return {
|
|
68
|
+
day,
|
|
69
|
+
minutes: hours * 60 + minutes,
|
|
70
|
+
time: `${String(hours).padStart(2, '0')}:${String(minutes).padStart(2, '0')}`,
|
|
71
|
+
timezone: resolvedTimezone,
|
|
72
|
+
};
|
|
56
73
|
}
|
|
57
74
|
/**
|
|
58
75
|
* Check if work is allowed at the current time
|
|
@@ -63,20 +80,16 @@ export function isWorkAllowed(config = DEFAULT_TIME_WINDOW) {
|
|
|
63
80
|
return {
|
|
64
81
|
allowed: true,
|
|
65
82
|
reason: t('timeWindow.disabled'),
|
|
66
|
-
currentTime: formatCurrentTime(),
|
|
83
|
+
currentTime: formatCurrentTime(config.timezone),
|
|
67
84
|
};
|
|
68
85
|
}
|
|
69
|
-
const
|
|
70
|
-
const
|
|
71
|
-
const
|
|
72
|
-
const
|
|
73
|
-
// Calculate day of week (KST-based)
|
|
74
|
-
// Calculate day of week (KST-based)
|
|
75
|
-
const kstDay = (now.getUTCDay() + (utcMinutes + kstOffset >= 24 * 60 ? 1 : 0)) % 7;
|
|
76
|
-
const currentTimeStr = `${String(Math.floor(kstMinutes / 60)).padStart(2, '0')}:${String(kstMinutes % 60).padStart(2, '0')}`;
|
|
86
|
+
const current = getCurrentTimeParts(config.timezone);
|
|
87
|
+
const currentMinutes = current.minutes;
|
|
88
|
+
const currentDay = current.day;
|
|
89
|
+
const currentTimeStr = current.time;
|
|
77
90
|
// Check day-of-week restrictions
|
|
78
91
|
if (config.restrictedDays && config.restrictedDays.length > 0) {
|
|
79
|
-
if (!config.restrictedDays.includes(
|
|
92
|
+
if (!config.restrictedDays.includes(currentDay)) {
|
|
80
93
|
return {
|
|
81
94
|
allowed: true,
|
|
82
95
|
reason: t('timeWindow.weekendOrUnrestricted'),
|
|
@@ -86,18 +99,18 @@ export function isWorkAllowed(config = DEFAULT_TIME_WINDOW) {
|
|
|
86
99
|
}
|
|
87
100
|
// Check blocked time ranges (highest priority)
|
|
88
101
|
for (const blocked of config.blockedWindows) {
|
|
89
|
-
if (isInTimeRange(
|
|
102
|
+
if (isInTimeRange(currentMinutes, blocked)) {
|
|
90
103
|
return {
|
|
91
104
|
allowed: false,
|
|
92
105
|
reason: t('timeWindow.blockedWindow', { start: blocked.start, end: blocked.end }),
|
|
93
106
|
currentTime: currentTimeStr,
|
|
94
|
-
nextAllowedTime: findNextAllowedWindow(
|
|
107
|
+
nextAllowedTime: findNextAllowedWindow(currentMinutes, config.allowedWindows),
|
|
95
108
|
};
|
|
96
109
|
}
|
|
97
110
|
}
|
|
98
111
|
// Check allowed time ranges
|
|
99
112
|
for (const allowed of config.allowedWindows) {
|
|
100
|
-
if (isInTimeRange(
|
|
113
|
+
if (isInTimeRange(currentMinutes, allowed)) {
|
|
101
114
|
return {
|
|
102
115
|
allowed: true,
|
|
103
116
|
reason: t('timeWindow.allowedWindow', { start: allowed.start, end: allowed.end }),
|
|
@@ -106,7 +119,7 @@ export function isWorkAllowed(config = DEFAULT_TIME_WINDOW) {
|
|
|
106
119
|
}
|
|
107
120
|
}
|
|
108
121
|
// Not in any allowed time range
|
|
109
|
-
const nextWindow = findNextAllowedWindow(
|
|
122
|
+
const nextWindow = findNextAllowedWindow(currentMinutes, config.allowedWindows);
|
|
110
123
|
return {
|
|
111
124
|
allowed: false,
|
|
112
125
|
reason: t('timeWindow.outsideAllowed'),
|
|
@@ -142,26 +155,19 @@ function findNextAllowedWindow(currentMinutes, windows) {
|
|
|
142
155
|
/**
|
|
143
156
|
* Format current time
|
|
144
157
|
*/
|
|
145
|
-
function formatCurrentTime() {
|
|
146
|
-
const
|
|
147
|
-
const
|
|
148
|
-
|
|
149
|
-
const kstMinutes = (utcMinutes + kstOffset) % (24 * 60);
|
|
150
|
-
return `${String(Math.floor(kstMinutes / 60)).padStart(2, '0')}:${String(kstMinutes % 60).padStart(2, '0')} KST`;
|
|
158
|
+
function formatCurrentTime(timezone) {
|
|
159
|
+
const current = getCurrentTimeParts(timezone);
|
|
160
|
+
const label = current.timezone === 'Asia/Seoul' ? 'KST' : current.timezone;
|
|
161
|
+
return `${current.time} ${label}`;
|
|
151
162
|
}
|
|
152
163
|
/**
|
|
153
164
|
* Get current market status
|
|
154
165
|
*/
|
|
155
166
|
export function getMarketStatus(config = DEFAULT_TIME_WINDOW) {
|
|
156
167
|
const result = isWorkAllowed(config);
|
|
157
|
-
const
|
|
158
|
-
const
|
|
159
|
-
|
|
160
|
-
const now = new Date();
|
|
161
|
-
const kstOffset = 9 * 60;
|
|
162
|
-
const utcMinutes = now.getUTCHours() * 60 + now.getUTCMinutes();
|
|
163
|
-
const kstDay = (now.getUTCDay() + (utcMinutes + kstOffset >= 24 * 60 ? 1 : 0)) % 7;
|
|
164
|
-
if (config.restrictedDays && config.restrictedDays.length > 0 && !config.restrictedDays.includes(kstDay)) {
|
|
168
|
+
const current = getCurrentTimeParts(config.timezone);
|
|
169
|
+
const totalMinutes = current.minutes;
|
|
170
|
+
if (config.restrictedDays && config.restrictedDays.length > 0 && !config.restrictedDays.includes(current.day)) {
|
|
165
171
|
return {
|
|
166
172
|
status: 'closed',
|
|
167
173
|
description: t('timeWindow.marketStatus.closed'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timeWindow.js","sourceRoot":"","sources":["../../src/support/timeWindow.ts"],"names":[],"mappings":"AAAA,+CAA+C;AAC/C,qCAAqC;AACrC,qCAAqC;AACrC,+CAA+C;AAE/C,OAAO,EAAE,CAAC,EAAE,MAAM,oBAAoB,CAAC;AA+BvC;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAqB;IACnD,OAAO,EAAE,IAAI;IACb,0CAA0C;IAC1C,cAAc,EAAE;QACd,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE;QAChC,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE;KACjC;IACD,gDAAgD;IAChD,cAAc,EAAE;QACd,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE;KACjC;IACD,mCAAmC;IACnC,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC/B,QAAQ,EAAE,YAAY;CACvB,CAAC;AAEF;;;GAGG;AACH,SAAS,aAAa,CAAC,IAAY;IACjC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACrD,OAAO,KAAK,GAAG,EAAE,GAAG,OAAO,CAAC;AAC9B,CAAC;AAED;;GAEG;AACH,SAAS,aAAa,CAAC,cAAsB,EAAE,KAAgB;IAC7D,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACzC,MAAM,GAAG,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAErC,gDAAgD;IAChD,IAAI,KAAK,GAAG,GAAG,EAAE,CAAC;QAChB,OAAO,cAAc,IAAI,KAAK,IAAI,cAAc,IAAI,GAAG,CAAC;IAC1D,CAAC;IAED,OAAO,cAAc,IAAI,KAAK,IAAI,cAAc,IAAI,GAAG,CAAC;AAC1D,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"timeWindow.js","sourceRoot":"","sources":["../../src/support/timeWindow.ts"],"names":[],"mappings":"AAAA,+CAA+C;AAC/C,qCAAqC;AACrC,qCAAqC;AACrC,+CAA+C;AAE/C,OAAO,EAAE,CAAC,EAAE,MAAM,oBAAoB,CAAC;AA+BvC;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAqB;IACnD,OAAO,EAAE,IAAI;IACb,0CAA0C;IAC1C,cAAc,EAAE;QACd,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE;QAChC,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE;KACjC;IACD,gDAAgD;IAChD,cAAc,EAAE;QACd,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE;KACjC;IACD,mCAAmC;IACnC,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC/B,QAAQ,EAAE,YAAY;CACvB,CAAC;AAEF,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,QAAQ,IAAI,YAAY,CAAC;AACtE,MAAM,aAAa,GAA2B;IAC5C,GAAG,EAAE,CAAC;IACN,GAAG,EAAE,CAAC;IACN,GAAG,EAAE,CAAC;IACN,GAAG,EAAE,CAAC;IACN,GAAG,EAAE,CAAC;IACN,GAAG,EAAE,CAAC;IACN,GAAG,EAAE,CAAC;CACP,CAAC;AAEF;;;GAGG;AACH,SAAS,aAAa,CAAC,IAAY;IACjC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACrD,OAAO,KAAK,GAAG,EAAE,GAAG,OAAO,CAAC;AAC9B,CAAC;AAED;;GAEG;AACH,SAAS,aAAa,CAAC,cAAsB,EAAE,KAAgB;IAC7D,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACzC,MAAM,GAAG,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAErC,gDAAgD;IAChD,IAAI,KAAK,GAAG,GAAG,EAAE,CAAC;QAChB,OAAO,cAAc,IAAI,KAAK,IAAI,cAAc,IAAI,GAAG,CAAC;IAC1D,CAAC;IAED,OAAO,cAAc,IAAI,KAAK,IAAI,cAAc,IAAI,GAAG,CAAC;AAC1D,CAAC;AAED,SAAS,mBAAmB,CAAC,QAA4B;IAMvD,MAAM,gBAAgB,GAAG,QAAQ,IAAI,gBAAgB,CAAC;IACtD,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE;QAC7C,QAAQ,EAAE,gBAAgB;QAC1B,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE,KAAK;KACjB,CAAC,CAAC,aAAa,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IAE7B,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAChF,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACtC,MAAM,GAAG,GAAG,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAE1C,OAAO;QACL,GAAG;QACH,OAAO,EAAE,KAAK,GAAG,EAAE,GAAG,OAAO;QAC7B,IAAI,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE;QAC7E,QAAQ,EAAE,gBAAgB;KAC3B,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,SAA2B,mBAAmB;IAM1E,2BAA2B;IAC3B,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,OAAO;YACL,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,CAAC,CAAC,qBAAqB,CAAC;YAChC,WAAW,EAAE,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC;SAChD,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IACvC,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC;IAC/B,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAEpC,iCAAiC;IACjC,IAAI,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9D,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YAChD,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,CAAC,CAAC,kCAAkC,CAAC;gBAC7C,WAAW,EAAE,cAAc;aAC5B,CAAC;QACJ,CAAC;IACH,CAAC;IAED,+CAA+C;IAC/C,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;QAC5C,IAAI,aAAa,CAAC,cAAc,EAAE,OAAO,CAAC,EAAE,CAAC;YAC3C,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,CAAC,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;gBACjF,WAAW,EAAE,cAAc;gBAC3B,eAAe,EAAE,qBAAqB,CAAC,cAAc,EAAE,MAAM,CAAC,cAAc,CAAC;aAC9E,CAAC;QACJ,CAAC;IACH,CAAC;IAED,4BAA4B;IAC5B,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;QAC5C,IAAI,aAAa,CAAC,cAAc,EAAE,OAAO,CAAC,EAAE,CAAC;YAC3C,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,CAAC,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;gBACjF,WAAW,EAAE,cAAc;aAC5B,CAAC;QACJ,CAAC;IACH,CAAC;IAED,gCAAgC;IAChC,MAAM,UAAU,GAAG,qBAAqB,CAAC,cAAc,EAAE,MAAM,CAAC,cAAc,CAAC,CAAC;IAChF,OAAO;QACL,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,CAAC,CAAC,2BAA2B,CAAC;QACtC,WAAW,EAAE,cAAc;QAC3B,eAAe,EAAE,UAAU;KAC5B,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAS,qBAAqB,CAAC,cAAsB,EAAE,OAAoB;IACzE,iDAAiD;IACjD,IAAI,YAAY,GAAkB,IAAI,CAAC;IAEvC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,KAAK,GAAG,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAE1C,IAAI,KAAK,GAAG,cAAc,EAAE,CAAC;YAC3B,IAAI,YAAY,KAAK,IAAI,IAAI,KAAK,GAAG,YAAY,EAAE,CAAC;gBAClD,YAAY,GAAG,KAAK,CAAC;YACvB,CAAC;QACH,CAAC;IACH,CAAC;IAED,4DAA4D;IAC5D,IAAI,YAAY,KAAK,IAAI,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChD,YAAY,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC/C,+CAA+C;QAC/C,OAAO,CAAC,CAAC,uBAAuB,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;QAC1B,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,YAAY,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;IACnH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;GAEG;AACH,SAAS,iBAAiB,CAAC,QAA4B;IACrD,MAAM,OAAO,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAC9C,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IAC3E,OAAO,GAAG,OAAO,CAAC,IAAI,IAAI,KAAK,EAAE,CAAC;AACpC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,SAA2B,mBAAmB;IAK5E,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IACrC,MAAM,OAAO,GAAG,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACrD,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAErC,IAAI,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAC9G,OAAO;YACL,MAAM,EAAE,QAAQ;YAChB,WAAW,EAAE,CAAC,CAAC,gCAAgC,CAAC;YAChD,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,CAAC;IACJ,CAAC;IAED,kCAAkC;IAClC,IAAI,YAAY,IAAI,GAAG,IAAI,YAAY,GAAG,GAAG,EAAE,CAAC;QAC9C,OAAO;YACL,MAAM,EAAE,YAAY;YACpB,WAAW,EAAE,CAAC,CAAC,mCAAmC,CAAC;YACnD,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,CAAC;IACJ,CAAC;IAED,sCAAsC;IACtC,IAAI,YAAY,IAAI,GAAG,IAAI,YAAY,GAAG,GAAG,EAAE,CAAC;QAC9C,OAAO;YACL,MAAM,EAAE,SAAS;YACjB,WAAW,EAAE,CAAC,CAAC,iCAAiC,CAAC;YACjD,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,CAAC;IACJ,CAAC;IAED,mCAAmC;IACnC,IAAI,YAAY,IAAI,GAAG,IAAI,YAAY,GAAG,IAAI,EAAE,CAAC;QAC/C,OAAO;YACL,MAAM,EAAE,aAAa;YACrB,WAAW,EAAE,CAAC,CAAC,oCAAoC,CAAC;YACpD,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,CAAC;IACJ,CAAC;IAED,gBAAgB;IAChB,OAAO;QACL,MAAM,EAAE,QAAQ;QAChB,WAAW,EAAE,CAAC,CAAC,gCAAgC,CAAC;QAChD,OAAO,EAAE,MAAM,CAAC,OAAO;KACxB,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,QAAiB;IACjD,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAE/B,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,MAAM,GAAG,GAAG,QAAQ;YAClB,CAAC,CAAC,CAAC,CAAC,wBAAwB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC;YAClG,CAAC,CAAC,CAAC,CAAC,8BAA8B,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;QAE3F,MAAM,QAAQ,GAAG,MAAM,CAAC,eAAe;YACrC,CAAC,CAAC,CAAC,CAAC,4BAA4B,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC;YACnE,CAAC,CAAC,EAAE,CAAC;QAEP,MAAM,IAAI,KAAK,CAAC,GAAG,GAAG,QAAQ,CAAC,CAAC;IAClC,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,oBAAoB;IAClC,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IAEjC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IACxC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC;IAExF,OAAO,GAAG,IAAI,MAAM,MAAM;EAC1B,CAAC,CAAC,wBAAwB,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC;EACvD,CAAC,CAAC,mBAAmB,EAAE,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC;EAC3D,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,wBAAwB,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC;AACpH,CAAC;AAED;;GAEG;AACH,IAAI,aAAa,GAAqB,EAAE,GAAG,mBAAmB,EAAE,CAAC;AAEjE,MAAM,UAAU,mBAAmB,CAAC,MAAiC;IACnE,aAAa,GAAG,EAAE,GAAG,aAAa,EAAE,GAAG,MAAM,EAAE,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,mBAAmB;IACjC,OAAO,EAAE,GAAG,aAAa,EAAE,CAAC;AAC9B,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB;IAC9B,OAAO,aAAa,CAAC,aAAa,CAAC,CAAC;AACtC,CAAC"}
|
|
@@ -25,5 +25,17 @@ export interface NotifierDeps {
|
|
|
25
25
|
* Never throws. (INT-2270)
|
|
26
26
|
*/
|
|
27
27
|
export declare function maybeNotifyUpdate(current: string, deps?: NotifierDeps): Promise<void>;
|
|
28
|
+
export interface AutoUpdateDeps extends NotifierDeps {
|
|
29
|
+
install?: (pkg: string) => boolean;
|
|
30
|
+
reexec?: () => void;
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* Auto-update: if a newer version is on npm, `npm i -g` it and re-exec the
|
|
34
|
+
* current command on the new binary. Default ON; falls back to a passive notice
|
|
35
|
+
* when opted out (OPENSWARM_NO_AUTO_UPDATE). Skips CI/non-TTY/meta invocations
|
|
36
|
+
* (never installs unattended) and no-ops once re-executed (OPENSWARM_UPDATED).
|
|
37
|
+
* Uses the same 24h cache as the notice. Never throws. (INT-2394)
|
|
38
|
+
*/
|
|
39
|
+
export declare function maybeAutoUpdate(current: string, deps?: AutoUpdateDeps): Promise<void>;
|
|
28
40
|
export {};
|
|
29
41
|
//# sourceMappingURL=updateNotifier.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateNotifier.d.ts","sourceRoot":"","sources":["../../src/support/updateNotifier.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"updateNotifier.d.ts","sourceRoot":"","sources":["../../src/support/updateNotifier.ts"],"names":[],"mappings":"AAoBA,UAAU,WAAW;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wFAAwF;AACxF,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAShE;AAED,yFAAyF;AACzF,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAO1F;AAoCD,wEAAwE;AACxE,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAK1E;AAED,MAAM,WAAW,YAAY;IAC3B,WAAW,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC7D,SAAS,CAAC,EAAE,MAAM,WAAW,GAAG,IAAI,CAAC;IACrC,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IAC1C,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,YAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CA6B/F;AAyBD,MAAM,WAAW,cAAe,SAAQ,YAAY;IAClD,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IACnC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;CACrB;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,cAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAuC/F"}
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
// CI, `--version`/`--help`, or `NO_UPDATE_NOTIFIER` — it must never slow down or
|
|
9
9
|
// break the CLI. The network/fs/clock are injectable for tests.
|
|
10
10
|
import { readFileSync, writeFileSync, mkdirSync } from 'node:fs';
|
|
11
|
+
import { execFileSync, spawnSync } from 'node:child_process';
|
|
11
12
|
import { join, dirname } from 'node:path';
|
|
12
13
|
import { homedir } from 'node:os';
|
|
13
14
|
import { c } from './colors.js';
|
|
@@ -116,4 +117,74 @@ export async function maybeNotifyUpdate(current, deps = {}) {
|
|
|
116
117
|
// A notifier must never break the CLI.
|
|
117
118
|
}
|
|
118
119
|
}
|
|
120
|
+
/** `npm install -g <pkg>@latest`. Returns true on success. (INT-2394) */
|
|
121
|
+
function defaultInstall(pkg) {
|
|
122
|
+
try {
|
|
123
|
+
execFileSync('npm', ['install', '-g', `${pkg}@latest`], { stdio: 'inherit', timeout: 180_000 });
|
|
124
|
+
return true;
|
|
125
|
+
}
|
|
126
|
+
catch {
|
|
127
|
+
return false;
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
/**
|
|
131
|
+
* Re-run the current command with the freshly-installed binary. Marks the child
|
|
132
|
+
* with OPENSWARM_UPDATED=1 so it won't try to update again (loop guard), waits
|
|
133
|
+
* for it, and exits with its code. Does not return on success. (INT-2394)
|
|
134
|
+
*/
|
|
135
|
+
function defaultReexec() {
|
|
136
|
+
const child = spawnSync(process.execPath, process.argv.slice(1), {
|
|
137
|
+
stdio: 'inherit',
|
|
138
|
+
env: { ...process.env, OPENSWARM_UPDATED: '1' },
|
|
139
|
+
});
|
|
140
|
+
process.exit(child.status ?? 0);
|
|
141
|
+
}
|
|
142
|
+
/**
|
|
143
|
+
* Auto-update: if a newer version is on npm, `npm i -g` it and re-exec the
|
|
144
|
+
* current command on the new binary. Default ON; falls back to a passive notice
|
|
145
|
+
* when opted out (OPENSWARM_NO_AUTO_UPDATE). Skips CI/non-TTY/meta invocations
|
|
146
|
+
* (never installs unattended) and no-ops once re-executed (OPENSWARM_UPDATED).
|
|
147
|
+
* Uses the same 24h cache as the notice. Never throws. (INT-2394)
|
|
148
|
+
*/
|
|
149
|
+
export async function maybeAutoUpdate(current, deps = {}) {
|
|
150
|
+
try {
|
|
151
|
+
const argv = deps.argv ?? process.argv;
|
|
152
|
+
const env = deps.env ?? process.env;
|
|
153
|
+
const isTTY = deps.isTTY ?? !!process.stdout.isTTY;
|
|
154
|
+
if (env.OPENSWARM_UPDATED)
|
|
155
|
+
return; // already the re-exec'd child
|
|
156
|
+
if (env.OPENSWARM_NO_AUTO_UPDATE)
|
|
157
|
+
return maybeNotifyUpdate(current, deps); // opted out → notice only
|
|
158
|
+
if (shouldSkip(argv, env, isTTY))
|
|
159
|
+
return; // CI / non-TTY / --version etc.
|
|
160
|
+
const now = deps.now ?? (() => Date.now());
|
|
161
|
+
const read = deps.readCache ?? readCache;
|
|
162
|
+
const write = deps.writeCache ?? writeCache;
|
|
163
|
+
const fetchFn = deps.fetchLatest ?? fetchLatest;
|
|
164
|
+
const out = deps.write ?? ((s) => process.stderr.write(s));
|
|
165
|
+
const install = deps.install ?? defaultInstall;
|
|
166
|
+
const reexec = deps.reexec ?? defaultReexec;
|
|
167
|
+
const cache = read();
|
|
168
|
+
let latest = cache?.latest ?? null;
|
|
169
|
+
const fresh = cache != null && now() - cache.checkedAt < DAY_MS;
|
|
170
|
+
if (!fresh) {
|
|
171
|
+
const fetched = await fetchFn();
|
|
172
|
+
write({ latest: fetched ?? latest ?? current, checkedAt: now() });
|
|
173
|
+
if (fetched)
|
|
174
|
+
latest = fetched;
|
|
175
|
+
}
|
|
176
|
+
if (!latest || !isNewer(latest, current))
|
|
177
|
+
return;
|
|
178
|
+
out(`\n ${c.dim('Updating')} ${c.dim(current)} ${c.dim('→')} ${c.green(latest)}…\n`);
|
|
179
|
+
if (!install(PKG)) {
|
|
180
|
+
out(` ${c.dim(`Auto-update failed; continuing on ${current}. Run npm i -g ${PKG} manually.`)}\n`);
|
|
181
|
+
return;
|
|
182
|
+
}
|
|
183
|
+
out(` ${c.green('Updated')} ${c.dim('→')} ${c.green(latest)}. ${c.dim('Restarting…')}\n`);
|
|
184
|
+
reexec(); // replaces/exits the process on success
|
|
185
|
+
}
|
|
186
|
+
catch {
|
|
187
|
+
// Auto-update must never break the CLI.
|
|
188
|
+
}
|
|
189
|
+
}
|
|
119
190
|
//# sourceMappingURL=updateNotifier.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateNotifier.js","sourceRoot":"","sources":["../../src/support/updateNotifier.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"updateNotifier.js","sourceRoot":"","sources":["../../src/support/updateNotifier.ts"],"names":[],"mappings":"AAAA,+CAA+C;AAC/C,yCAAyC;AACzC,+CAA+C;AAC/C,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAChF,8EAA8E;AAC9E,iFAAiF;AACjF,gEAAgE;AAEhE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,CAAC,EAAE,MAAM,aAAa,CAAC;AAEhC,MAAM,GAAG,GAAG,oBAAoB,CAAC;AACjC,MAAM,MAAM,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AACnC,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,YAAY,EAAE,mBAAmB,CAAC,CAAC;AAOtE,wFAAwF;AACxF,MAAM,UAAU,OAAO,CAAC,MAAc,EAAE,OAAe;IACrD,MAAM,KAAK,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IACzF,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;IACxB,MAAM,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;IACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3B,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAC3C,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;IAC9C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,yFAAyF;AACzF,MAAM,UAAU,UAAU,CAAC,IAAc,EAAE,GAAsB,EAAE,KAAc;IAC/E,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,kBAAkB,IAAI,GAAG,CAAC,4BAA4B;QAAE,OAAO,IAAI,CAAC;IACtF,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC3B,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,CAAC,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IAChF,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IAC/C,OAAO,KAAK,CAAC;AACf,CAAC;AAED,gFAAgF;AAChF,KAAK,UAAU,WAAW,CAAC,SAAS,GAAG,IAAI;IACzC,MAAM,IAAI,GAAG,IAAI,eAAe,EAAE,CAAC;IACnC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,SAAS,CAAC,CAAC;IACxD,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,8BAA8B,GAAG,SAAS,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QAC7F,IAAI,CAAC,GAAG,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;QACzB,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAA0B,CAAC;QACzD,OAAO,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IAChE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;YAAS,CAAC;QACT,YAAY,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC;AACH,CAAC;AAED,SAAS,SAAS;IAChB,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;QACzD,OAAO,OAAO,GAAG,EAAE,MAAM,KAAK,QAAQ,IAAI,OAAO,GAAG,EAAE,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5F,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,KAAkB;IACpC,IAAI,CAAC;QACH,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACpD,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IACnD,CAAC;IAAC,MAAM,CAAC;QACP,iEAAiE;IACnE,CAAC;AACH,CAAC;AAED,wEAAwE;AACxE,MAAM,UAAU,kBAAkB,CAAC,OAAe,EAAE,MAAc;IAChE,OAAO,CACL,OAAO,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI;QACvF,SAAS,CAAC,CAAC,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC,eAAe,CAClD,CAAC;AACJ,CAAC;AAaD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,OAAe,EAAE,OAAqB,EAAE;IAC9E,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;QACvC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;QACpC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QACnD,IAAI,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC;YAAE,OAAO;QAEzC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC;QACzC,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC;QAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC;QAChD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAEnE,MAAM,KAAK,GAAG,IAAI,EAAE,CAAC;QACrB,IAAI,MAAM,GAAG,KAAK,EAAE,MAAM,IAAI,IAAI,CAAC;QACnC,MAAM,KAAK,GAAG,KAAK,IAAI,IAAI,IAAI,GAAG,EAAE,GAAG,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC;QAEhE,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,OAAO,GAAG,MAAM,OAAO,EAAE,CAAC;YAChC,wEAAwE;YACxE,wEAAwE;YACxE,KAAK,CAAC,EAAE,MAAM,EAAE,OAAO,IAAI,MAAM,IAAI,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YAClE,IAAI,OAAO;gBAAE,MAAM,GAAG,OAAO,CAAC;QAChC,CAAC;QAED,IAAI,MAAM,IAAI,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;YAAE,GAAG,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;IACnF,CAAC;IAAC,MAAM,CAAC;QACP,uCAAuC;IACzC,CAAC;AACH,CAAC;AAED,yEAAyE;AACzE,SAAS,cAAc,CAAC,GAAW;IACjC,IAAI,CAAC;QACH,YAAY,CAAC,KAAK,EAAE,CAAC,SAAS,EAAE,IAAI,EAAE,GAAG,GAAG,SAAS,CAAC,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAChG,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,aAAa;IACpB,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;QAC/D,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,iBAAiB,EAAE,GAAG,EAAE;KAChD,CAAC,CAAC;IACH,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;AAClC,CAAC;AAOD;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAAe,EAAE,OAAuB,EAAE;IAC9E,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;QACvC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;QACpC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QAEnD,IAAI,GAAG,CAAC,iBAAiB;YAAE,OAAO,CAAuB,8BAA8B;QACvF,IAAI,GAAG,CAAC,wBAAwB;YAAE,OAAO,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,0BAA0B;QACrG,IAAI,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC;YAAE,OAAO,CAAgB,gCAAgC;QAEzF,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC;QACzC,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC;QAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC;QAChD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACnE,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,cAAc,CAAC;QAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,aAAa,CAAC;QAE5C,MAAM,KAAK,GAAG,IAAI,EAAE,CAAC;QACrB,IAAI,MAAM,GAAG,KAAK,EAAE,MAAM,IAAI,IAAI,CAAC;QACnC,MAAM,KAAK,GAAG,KAAK,IAAI,IAAI,IAAI,GAAG,EAAE,GAAG,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC;QAChE,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,OAAO,GAAG,MAAM,OAAO,EAAE,CAAC;YAChC,KAAK,CAAC,EAAE,MAAM,EAAE,OAAO,IAAI,MAAM,IAAI,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YAClE,IAAI,OAAO;gBAAE,MAAM,GAAG,OAAO,CAAC;QAChC,CAAC;QAED,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;YAAE,OAAO;QAEjD,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACtF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAClB,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,qCAAqC,OAAO,kBAAkB,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;YACnG,OAAO;QACT,CAAC;QACD,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC3F,MAAM,EAAE,CAAC,CAAC,wCAAwC;IACpD,CAAC;IAAC,MAAM,CAAC;QACP,wCAAwC;IAC1C,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../src/support/web.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../src/support/web.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAiQ1E,UAAU,WAAW;IACnB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC/B;AAqCD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,EAAE,GAAG,GAAE,WAA+B,GAAG,IAAI,CAgCrG;AA0BD;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAI3D;AAmCD,wBAAsB,cAAc,CAAC,IAAI,GAAE,MAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAq8BvE;AAED;;GAEG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAUnD"}
|
package/dist/support/web.js
CHANGED
|
@@ -27,6 +27,7 @@ import { ISSUE_BOARD_HTML } from '../issues/issueBoardHtml.js';
|
|
|
27
27
|
import { createSubIssuesWithDependencies, getTaskSource } from '../automation/runnerExecution.js';
|
|
28
28
|
let server = null;
|
|
29
29
|
let runnerRef;
|
|
30
|
+
let gitStatusPoller = null;
|
|
30
31
|
const MAX_REQUEST_BODY_BYTES = 1024 * 1024;
|
|
31
32
|
class HttpError extends Error {
|
|
32
33
|
statusCode;
|
|
@@ -72,6 +73,9 @@ function safeErrorMessage(err) {
|
|
|
72
73
|
function isLoopbackAddress(address) {
|
|
73
74
|
return address === '127.0.0.1' || address === '::1' || address === '::ffff:127.0.0.1';
|
|
74
75
|
}
|
|
76
|
+
function isLoopbackHostname(hostname) {
|
|
77
|
+
return hostname === 'localhost' || hostname === '127.0.0.1' || hostname === '::1' || hostname === '[::1]';
|
|
78
|
+
}
|
|
75
79
|
function extractBearerToken(header) {
|
|
76
80
|
if (!header)
|
|
77
81
|
return null;
|
|
@@ -82,9 +86,7 @@ function extractBearerToken(header) {
|
|
|
82
86
|
return null;
|
|
83
87
|
return header.slice(7).trim() || null;
|
|
84
88
|
}
|
|
85
|
-
function
|
|
86
|
-
if (isLoopbackAddress(req.socket.remoteAddress))
|
|
87
|
-
return true;
|
|
89
|
+
function hasValidWebToken(req) {
|
|
88
90
|
const configuredToken = process.env.OPENSWARM_WEB_TOKEN?.trim();
|
|
89
91
|
if (!configuredToken)
|
|
90
92
|
return false;
|
|
@@ -94,9 +96,63 @@ function isAuthorizedMutation(req) {
|
|
|
94
96
|
: req.headers['x-openswarm-token']);
|
|
95
97
|
return presentedToken === configuredToken;
|
|
96
98
|
}
|
|
99
|
+
function getEffectivePort(url) {
|
|
100
|
+
if (url.port)
|
|
101
|
+
return url.port;
|
|
102
|
+
return url.protocol === 'https:' ? '443' : '80';
|
|
103
|
+
}
|
|
104
|
+
function isTrustedLocalOrigin(req) {
|
|
105
|
+
const origin = req.headers.origin;
|
|
106
|
+
if (!origin)
|
|
107
|
+
return true;
|
|
108
|
+
if (!isAllowedOrigin(origin))
|
|
109
|
+
return false;
|
|
110
|
+
let originUrl;
|
|
111
|
+
try {
|
|
112
|
+
originUrl = new URL(origin);
|
|
113
|
+
}
|
|
114
|
+
catch {
|
|
115
|
+
return false;
|
|
116
|
+
}
|
|
117
|
+
if (originUrl.hostname === 'tauri.localhost')
|
|
118
|
+
return true;
|
|
119
|
+
const host = req.headers.host;
|
|
120
|
+
if (!host)
|
|
121
|
+
return false;
|
|
122
|
+
let hostUrl;
|
|
123
|
+
try {
|
|
124
|
+
hostUrl = new URL(`${originUrl.protocol}//${host}`);
|
|
125
|
+
}
|
|
126
|
+
catch {
|
|
127
|
+
return false;
|
|
128
|
+
}
|
|
129
|
+
const sameHost = originUrl.hostname === hostUrl.hostname;
|
|
130
|
+
const loopbackAlias = isLoopbackHostname(originUrl.hostname) && isLoopbackHostname(hostUrl.hostname);
|
|
131
|
+
return (sameHost || loopbackAlias) && getEffectivePort(originUrl) === getEffectivePort(hostUrl);
|
|
132
|
+
}
|
|
133
|
+
function isAuthorizedMutation(req) {
|
|
134
|
+
if (hasValidWebToken(req))
|
|
135
|
+
return true;
|
|
136
|
+
return isLoopbackAddress(req.socket.remoteAddress) && isTrustedLocalOrigin(req);
|
|
137
|
+
}
|
|
138
|
+
function isAuthorizedLocalRead(req) {
|
|
139
|
+
if (hasValidWebToken(req))
|
|
140
|
+
return true;
|
|
141
|
+
return isLoopbackAddress(req.socket.remoteAddress) && isTrustedLocalOrigin(req);
|
|
142
|
+
}
|
|
97
143
|
function isMutatingApiRequest(pathname, method) {
|
|
98
144
|
return pathname.startsWith('/api/') && ['DELETE', 'PATCH', 'POST', 'PUT'].includes(method ?? '');
|
|
99
145
|
}
|
|
146
|
+
function isMutatingGraphQLRequest(requestUrl, method) {
|
|
147
|
+
if (!isGraphQLRequest(requestUrl.pathname))
|
|
148
|
+
return false;
|
|
149
|
+
if (['DELETE', 'PATCH', 'POST', 'PUT'].includes(method ?? ''))
|
|
150
|
+
return true;
|
|
151
|
+
if (method !== 'GET')
|
|
152
|
+
return false;
|
|
153
|
+
const query = requestUrl.searchParams.get('query') ?? '';
|
|
154
|
+
return query.includes('mutation');
|
|
155
|
+
}
|
|
100
156
|
function writeJson(res, statusCode, body) {
|
|
101
157
|
res.writeHead(statusCode, { 'Content-Type': 'application/json' });
|
|
102
158
|
res.end(JSON.stringify(body));
|
|
@@ -337,7 +393,7 @@ export async function startWebServer(port = 3847) {
|
|
|
337
393
|
res.end();
|
|
338
394
|
return;
|
|
339
395
|
}
|
|
340
|
-
if (isMutatingApiRequest(url, req.method) && !isAuthorizedMutation(req)) {
|
|
396
|
+
if ((isMutatingApiRequest(url, req.method) || isMutatingGraphQLRequest(requestUrl, req.method)) && !isAuthorizedMutation(req)) {
|
|
341
397
|
writeJson(res, 403, { error: 'Forbidden' });
|
|
342
398
|
return;
|
|
343
399
|
}
|
|
@@ -370,7 +426,7 @@ export async function startWebServer(port = 3847) {
|
|
|
370
426
|
else if (url === '/api/stats') {
|
|
371
427
|
const stats = runnerRef?.getStats();
|
|
372
428
|
const state = runnerRef?.getState();
|
|
373
|
-
const adapters = runnerRef?.getAdapterSummary();
|
|
429
|
+
const adapters = await runnerRef?.getAdapterSummary();
|
|
374
430
|
res.writeHead(200, { 'Content-Type': 'application/json' });
|
|
375
431
|
res.end(JSON.stringify({
|
|
376
432
|
runningTasks: stats?.schedulerStats?.running ?? 0,
|
|
@@ -428,6 +484,7 @@ export async function startWebServer(port = 3847) {
|
|
|
428
484
|
return {
|
|
429
485
|
path: p,
|
|
430
486
|
name: dirName,
|
|
487
|
+
linearProject: info?.name,
|
|
431
488
|
enabled: enabledPaths.has(p),
|
|
432
489
|
pinned: pinnedProjects.has(p),
|
|
433
490
|
running: info?.running ?? [],
|
|
@@ -735,8 +792,9 @@ export async function startWebServer(port = 3847) {
|
|
|
735
792
|
const memoryContext = memories.length > 0
|
|
736
793
|
? '## Relevant Past Discussions\n' + memories.map(m => `- ${m.content.replace(/^Q: |^A: /g, '')}`).join('\n')
|
|
737
794
|
: '';
|
|
738
|
-
const
|
|
739
|
-
const
|
|
795
|
+
const adapterSummary = await runnerRef?.getAdapterSummary();
|
|
796
|
+
const provider = adapterSummary?.defaultAdapter ?? 'codex';
|
|
797
|
+
const model = adapterSummary?.worker?.model ?? getDefaultChatModel(provider);
|
|
740
798
|
const contextPrompt = [
|
|
741
799
|
'You are OpenSwarm, an autonomous code development supervisor.',
|
|
742
800
|
'You manage a fleet of coding agents that autonomously work on Linear issues.',
|
|
@@ -1068,6 +1126,10 @@ export async function startWebServer(port = 3847) {
|
|
|
1068
1126
|
// Returns: { path, parent, entries: [{name, isDir}] } — dotfiles excluded, dirs first.
|
|
1069
1127
|
}
|
|
1070
1128
|
else if (url.startsWith('/api/fs/list') && req.method === 'GET') {
|
|
1129
|
+
if (!isAuthorizedLocalRead(req)) {
|
|
1130
|
+
writeJson(res, 403, { error: 'Forbidden' });
|
|
1131
|
+
return;
|
|
1132
|
+
}
|
|
1071
1133
|
try {
|
|
1072
1134
|
const requested = requestUrl.searchParams.get('path')?.trim();
|
|
1073
1135
|
const startPath = requested && requested.length > 0
|
|
@@ -1240,7 +1302,7 @@ export async function startWebServer(port = 3847) {
|
|
|
1240
1302
|
console.log(`Web interface running at:`);
|
|
1241
1303
|
console.log(` - http://127.0.0.1:${port} (localhost)`);
|
|
1242
1304
|
console.log(` - http://${tailscaleIP}:${port} (Tailscale)`);
|
|
1243
|
-
startGitStatusPoller(() => Array.from(pinnedProjects));
|
|
1305
|
+
gitStatusPoller = startGitStatusPoller(() => Array.from(pinnedProjects));
|
|
1244
1306
|
startHealthChecker(30000);
|
|
1245
1307
|
resolve();
|
|
1246
1308
|
});
|
|
@@ -1250,6 +1312,10 @@ export async function startWebServer(port = 3847) {
|
|
|
1250
1312
|
* Stop the web server
|
|
1251
1313
|
*/
|
|
1252
1314
|
export async function stopWebServer() {
|
|
1315
|
+
if (gitStatusPoller) {
|
|
1316
|
+
clearInterval(gitStatusPoller);
|
|
1317
|
+
gitStatusPoller = null;
|
|
1318
|
+
}
|
|
1253
1319
|
if (server) {
|
|
1254
1320
|
server.close();
|
|
1255
1321
|
server = null;
|