@build-astron-co/nimbus 0.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +21 -0
- package/README.md +628 -0
- package/bin/nimbus +38 -0
- package/package.json +80 -0
- package/src/__tests__/app.test.ts +76 -0
- package/src/__tests__/audit.test.ts +877 -0
- package/src/__tests__/circuit-breaker.test.ts +116 -0
- package/src/__tests__/cli-run.test.ts +115 -0
- package/src/__tests__/context-manager.test.ts +502 -0
- package/src/__tests__/context.test.ts +242 -0
- package/src/__tests__/enterprise.test.ts +401 -0
- package/src/__tests__/generator.test.ts +433 -0
- package/src/__tests__/hooks.test.ts +582 -0
- package/src/__tests__/init.test.ts +436 -0
- package/src/__tests__/intent-parser.test.ts +229 -0
- package/src/__tests__/llm-router.test.ts +209 -0
- package/src/__tests__/lsp.test.ts +293 -0
- package/src/__tests__/modes.test.ts +336 -0
- package/src/__tests__/permissions.test.ts +338 -0
- package/src/__tests__/serve.test.ts +275 -0
- package/src/__tests__/sessions.test.ts +227 -0
- package/src/__tests__/sharing.test.ts +288 -0
- package/src/__tests__/snapshots.test.ts +581 -0
- package/src/__tests__/state-db.test.ts +334 -0
- package/src/__tests__/stream-with-tools.test.ts +732 -0
- package/src/__tests__/subagents.test.ts +176 -0
- package/src/__tests__/system-prompt.test.ts +169 -0
- package/src/__tests__/tool-converter.test.ts +256 -0
- package/src/__tests__/tool-schemas.test.ts +397 -0
- package/src/__tests__/tools.test.ts +143 -0
- package/src/__tests__/version.test.ts +49 -0
- package/src/agent/compaction-agent.ts +227 -0
- package/src/agent/context-manager.ts +435 -0
- package/src/agent/context.ts +427 -0
- package/src/agent/deploy-preview.ts +426 -0
- package/src/agent/index.ts +68 -0
- package/src/agent/loop.ts +717 -0
- package/src/agent/modes.ts +429 -0
- package/src/agent/permissions.ts +466 -0
- package/src/agent/subagents/base.ts +116 -0
- package/src/agent/subagents/cost.ts +51 -0
- package/src/agent/subagents/explore.ts +42 -0
- package/src/agent/subagents/general.ts +54 -0
- package/src/agent/subagents/index.ts +102 -0
- package/src/agent/subagents/infra.ts +59 -0
- package/src/agent/subagents/security.ts +69 -0
- package/src/agent/system-prompt.ts +436 -0
- package/src/app.ts +122 -0
- package/src/audit/activity-log.ts +290 -0
- package/src/audit/compliance-checker.ts +540 -0
- package/src/audit/cost-tracker.ts +318 -0
- package/src/audit/index.ts +23 -0
- package/src/audit/security-scanner.ts +596 -0
- package/src/auth/guard.ts +75 -0
- package/src/auth/index.ts +56 -0
- package/src/auth/oauth.ts +455 -0
- package/src/auth/providers.ts +470 -0
- package/src/auth/sso.ts +113 -0
- package/src/auth/store.ts +505 -0
- package/src/auth/types.ts +187 -0
- package/src/build.ts +141 -0
- package/src/cli/index.ts +16 -0
- package/src/cli/init.ts +854 -0
- package/src/cli/openapi-spec.ts +356 -0
- package/src/cli/run.ts +237 -0
- package/src/cli/serve-auth.ts +80 -0
- package/src/cli/serve.ts +462 -0
- package/src/cli/web.ts +67 -0
- package/src/cli.ts +1417 -0
- package/src/clients/core-engine-client.ts +227 -0
- package/src/clients/enterprise-client.ts +334 -0
- package/src/clients/generator-client.ts +351 -0
- package/src/clients/git-client.ts +627 -0
- package/src/clients/github-client.ts +410 -0
- package/src/clients/helm-client.ts +504 -0
- package/src/clients/index.ts +80 -0
- package/src/clients/k8s-client.ts +497 -0
- package/src/clients/llm-client.ts +161 -0
- package/src/clients/rest-client.ts +130 -0
- package/src/clients/service-discovery.ts +33 -0
- package/src/clients/terraform-client.ts +482 -0
- package/src/clients/tools-client.ts +1843 -0
- package/src/clients/ws-client.ts +115 -0
- package/src/commands/analyze/index.ts +352 -0
- package/src/commands/apply/helm.ts +473 -0
- package/src/commands/apply/index.ts +213 -0
- package/src/commands/apply/k8s.ts +454 -0
- package/src/commands/apply/terraform.ts +582 -0
- package/src/commands/ask.ts +167 -0
- package/src/commands/audit/index.ts +238 -0
- package/src/commands/auth-cloud.ts +294 -0
- package/src/commands/auth-list.ts +134 -0
- package/src/commands/auth-profile.ts +121 -0
- package/src/commands/auth-status.ts +141 -0
- package/src/commands/aws/ec2.ts +501 -0
- package/src/commands/aws/iam.ts +397 -0
- package/src/commands/aws/index.ts +133 -0
- package/src/commands/aws/lambda.ts +396 -0
- package/src/commands/aws/rds.ts +439 -0
- package/src/commands/aws/s3.ts +439 -0
- package/src/commands/aws/vpc.ts +393 -0
- package/src/commands/aws-discover.ts +649 -0
- package/src/commands/aws-terraform.ts +805 -0
- package/src/commands/azure/aks.ts +376 -0
- package/src/commands/azure/functions.ts +253 -0
- package/src/commands/azure/index.ts +116 -0
- package/src/commands/azure/storage.ts +478 -0
- package/src/commands/azure/vm.ts +355 -0
- package/src/commands/billing/index.ts +256 -0
- package/src/commands/chat.ts +314 -0
- package/src/commands/config.ts +346 -0
- package/src/commands/cost/cloud-cost-estimator.ts +266 -0
- package/src/commands/cost/estimator.ts +79 -0
- package/src/commands/cost/index.ts +594 -0
- package/src/commands/cost/parsers/terraform.ts +273 -0
- package/src/commands/cost/parsers/types.ts +25 -0
- package/src/commands/cost/pricing/aws.ts +544 -0
- package/src/commands/cost/pricing/azure.ts +499 -0
- package/src/commands/cost/pricing/gcp.ts +396 -0
- package/src/commands/cost/pricing/index.ts +40 -0
- package/src/commands/demo.ts +250 -0
- package/src/commands/doctor.ts +794 -0
- package/src/commands/drift/index.ts +439 -0
- package/src/commands/explain.ts +277 -0
- package/src/commands/feedback.ts +389 -0
- package/src/commands/fix.ts +324 -0
- package/src/commands/fs/index.ts +402 -0
- package/src/commands/gcp/compute.ts +325 -0
- package/src/commands/gcp/functions.ts +271 -0
- package/src/commands/gcp/gke.ts +438 -0
- package/src/commands/gcp/iam.ts +344 -0
- package/src/commands/gcp/index.ts +129 -0
- package/src/commands/gcp/storage.ts +284 -0
- package/src/commands/generate-helm.ts +1249 -0
- package/src/commands/generate-k8s.ts +1560 -0
- package/src/commands/generate-terraform.ts +1460 -0
- package/src/commands/gh/index.ts +863 -0
- package/src/commands/git/index.ts +1343 -0
- package/src/commands/helm/index.ts +1126 -0
- package/src/commands/help.ts +539 -0
- package/src/commands/history.ts +142 -0
- package/src/commands/import.ts +868 -0
- package/src/commands/index.ts +367 -0
- package/src/commands/init.ts +1046 -0
- package/src/commands/k8s/index.ts +1137 -0
- package/src/commands/login.ts +631 -0
- package/src/commands/logout.ts +83 -0
- package/src/commands/onboarding.ts +228 -0
- package/src/commands/plan/display.ts +279 -0
- package/src/commands/plan/index.ts +599 -0
- package/src/commands/preview.ts +452 -0
- package/src/commands/questionnaire.ts +1270 -0
- package/src/commands/resume.ts +55 -0
- package/src/commands/team/index.ts +346 -0
- package/src/commands/template.ts +232 -0
- package/src/commands/tf/index.ts +1034 -0
- package/src/commands/upgrade.ts +550 -0
- package/src/commands/usage/index.ts +134 -0
- package/src/commands/version.ts +170 -0
- package/src/compat/index.ts +2 -0
- package/src/compat/runtime.ts +12 -0
- package/src/compat/sqlite.ts +107 -0
- package/src/config/index.ts +17 -0
- package/src/config/manager.ts +530 -0
- package/src/config/safety-policy.ts +358 -0
- package/src/config/schema.ts +125 -0
- package/src/config/types.ts +527 -0
- package/src/context/context-db.ts +199 -0
- package/src/demo/index.ts +349 -0
- package/src/demo/scenarios/full-journey.ts +229 -0
- package/src/demo/scenarios/getting-started.ts +127 -0
- package/src/demo/scenarios/helm-release.ts +341 -0
- package/src/demo/scenarios/k8s-deployment.ts +194 -0
- package/src/demo/scenarios/terraform-vpc.ts +170 -0
- package/src/demo/types.ts +92 -0
- package/src/engine/cost-estimator.ts +438 -0
- package/src/engine/diagram-generator.ts +256 -0
- package/src/engine/drift-detector.ts +902 -0
- package/src/engine/executor.ts +1035 -0
- package/src/engine/index.ts +76 -0
- package/src/engine/orchestrator.ts +636 -0
- package/src/engine/planner.ts +720 -0
- package/src/engine/safety.ts +743 -0
- package/src/engine/verifier.ts +770 -0
- package/src/enterprise/audit.ts +348 -0
- package/src/enterprise/auth.ts +270 -0
- package/src/enterprise/billing.ts +822 -0
- package/src/enterprise/index.ts +17 -0
- package/src/enterprise/teams.ts +443 -0
- package/src/generator/best-practices.ts +1608 -0
- package/src/generator/helm.ts +630 -0
- package/src/generator/index.ts +37 -0
- package/src/generator/intent-parser.ts +514 -0
- package/src/generator/kubernetes.ts +976 -0
- package/src/generator/terraform.ts +1867 -0
- package/src/history/index.ts +8 -0
- package/src/history/manager.ts +322 -0
- package/src/history/types.ts +34 -0
- package/src/hooks/config.ts +432 -0
- package/src/hooks/engine.ts +391 -0
- package/src/hooks/index.ts +4 -0
- package/src/llm/auth-bridge.ts +198 -0
- package/src/llm/circuit-breaker.ts +140 -0
- package/src/llm/config-loader.ts +201 -0
- package/src/llm/cost-calculator.ts +171 -0
- package/src/llm/index.ts +8 -0
- package/src/llm/model-aliases.ts +115 -0
- package/src/llm/provider-registry.ts +63 -0
- package/src/llm/providers/anthropic.ts +433 -0
- package/src/llm/providers/bedrock.ts +477 -0
- package/src/llm/providers/google.ts +405 -0
- package/src/llm/providers/ollama.ts +767 -0
- package/src/llm/providers/openai-compatible.ts +340 -0
- package/src/llm/providers/openai.ts +328 -0
- package/src/llm/providers/openrouter.ts +338 -0
- package/src/llm/router.ts +1035 -0
- package/src/llm/types.ts +232 -0
- package/src/lsp/client.ts +298 -0
- package/src/lsp/languages.ts +116 -0
- package/src/lsp/manager.ts +278 -0
- package/src/mcp/client.ts +402 -0
- package/src/mcp/index.ts +5 -0
- package/src/mcp/manager.ts +133 -0
- package/src/nimbus.ts +214 -0
- package/src/plugins/index.ts +27 -0
- package/src/plugins/loader.ts +334 -0
- package/src/plugins/manager.ts +376 -0
- package/src/plugins/types.ts +284 -0
- package/src/scanners/cicd-scanner.ts +258 -0
- package/src/scanners/cloud-scanner.ts +466 -0
- package/src/scanners/framework-scanner.ts +469 -0
- package/src/scanners/iac-scanner.ts +388 -0
- package/src/scanners/index.ts +539 -0
- package/src/scanners/language-scanner.ts +276 -0
- package/src/scanners/package-manager-scanner.ts +277 -0
- package/src/scanners/types.ts +172 -0
- package/src/sessions/manager.ts +365 -0
- package/src/sessions/types.ts +44 -0
- package/src/sharing/sync.ts +296 -0
- package/src/sharing/viewer.ts +97 -0
- package/src/snapshots/index.ts +2 -0
- package/src/snapshots/manager.ts +530 -0
- package/src/state/artifacts.ts +147 -0
- package/src/state/audit.ts +137 -0
- package/src/state/billing.ts +240 -0
- package/src/state/checkpoints.ts +117 -0
- package/src/state/config.ts +67 -0
- package/src/state/conversations.ts +14 -0
- package/src/state/credentials.ts +154 -0
- package/src/state/db.ts +58 -0
- package/src/state/index.ts +26 -0
- package/src/state/messages.ts +115 -0
- package/src/state/projects.ts +123 -0
- package/src/state/schema.ts +236 -0
- package/src/state/sessions.ts +147 -0
- package/src/state/teams.ts +200 -0
- package/src/telemetry.ts +108 -0
- package/src/tools/aws-ops.ts +952 -0
- package/src/tools/azure-ops.ts +579 -0
- package/src/tools/file-ops.ts +593 -0
- package/src/tools/gcp-ops.ts +625 -0
- package/src/tools/git-ops.ts +773 -0
- package/src/tools/github-ops.ts +799 -0
- package/src/tools/helm-ops.ts +943 -0
- package/src/tools/index.ts +17 -0
- package/src/tools/k8s-ops.ts +819 -0
- package/src/tools/schemas/converter.ts +184 -0
- package/src/tools/schemas/devops.ts +612 -0
- package/src/tools/schemas/index.ts +73 -0
- package/src/tools/schemas/standard.ts +1144 -0
- package/src/tools/schemas/types.ts +705 -0
- package/src/tools/terraform-ops.ts +862 -0
- package/src/types/ambient.d.ts +193 -0
- package/src/types/config.ts +83 -0
- package/src/types/drift.ts +116 -0
- package/src/types/enterprise.ts +335 -0
- package/src/types/index.ts +20 -0
- package/src/types/plan.ts +44 -0
- package/src/types/request.ts +65 -0
- package/src/types/response.ts +54 -0
- package/src/types/service.ts +51 -0
- package/src/ui/App.tsx +997 -0
- package/src/ui/DeployPreview.tsx +169 -0
- package/src/ui/Header.tsx +68 -0
- package/src/ui/InputBox.tsx +350 -0
- package/src/ui/MessageList.tsx +585 -0
- package/src/ui/PermissionPrompt.tsx +151 -0
- package/src/ui/StatusBar.tsx +158 -0
- package/src/ui/ToolCallDisplay.tsx +409 -0
- package/src/ui/chat-ui.ts +853 -0
- package/src/ui/index.ts +33 -0
- package/src/ui/ink/index.ts +711 -0
- package/src/ui/streaming.ts +176 -0
- package/src/ui/types.ts +57 -0
- package/src/utils/analytics.ts +72 -0
- package/src/utils/cost-warning.ts +27 -0
- package/src/utils/env.ts +46 -0
- package/src/utils/errors.ts +69 -0
- package/src/utils/event-bus.ts +38 -0
- package/src/utils/index.ts +24 -0
- package/src/utils/logger.ts +171 -0
- package/src/utils/rate-limiter.ts +121 -0
- package/src/utils/service-auth.ts +49 -0
- package/src/utils/validation.ts +53 -0
- package/src/version.ts +4 -0
- package/src/watcher/index.ts +163 -0
- package/src/wizard/approval.ts +383 -0
- package/src/wizard/index.ts +25 -0
- package/src/wizard/prompts.ts +338 -0
- package/src/wizard/types.ts +171 -0
- package/src/wizard/ui.ts +556 -0
- package/src/wizard/wizard.ts +304 -0
- package/tsconfig.json +24 -0
|
@@ -0,0 +1,505 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AuthStore - Credential Persistence Manager
|
|
3
|
+
* Manages storage and retrieval of authentication credentials at ~/.nimbus/auth.json
|
|
4
|
+
* API keys and access tokens are encrypted at rest using AES-256-GCM.
|
|
5
|
+
*/
|
|
6
|
+
|
|
7
|
+
import * as fs from 'fs';
|
|
8
|
+
import * as path from 'path';
|
|
9
|
+
import * as os from 'os';
|
|
10
|
+
import * as crypto from 'crypto';
|
|
11
|
+
import type {
|
|
12
|
+
AuthFile,
|
|
13
|
+
AuthStatus,
|
|
14
|
+
GitHubIdentity,
|
|
15
|
+
LLMProviderCredential,
|
|
16
|
+
LLMProviderName,
|
|
17
|
+
} from './types';
|
|
18
|
+
|
|
19
|
+
const AUTH_FILE_VERSION = 1;
|
|
20
|
+
|
|
21
|
+
/**
|
|
22
|
+
* Default empty auth file structure
|
|
23
|
+
*/
|
|
24
|
+
function createEmptyAuthFile(): AuthFile {
|
|
25
|
+
const now = new Date().toISOString();
|
|
26
|
+
return {
|
|
27
|
+
version: AUTH_FILE_VERSION,
|
|
28
|
+
identity: {},
|
|
29
|
+
providers: {},
|
|
30
|
+
createdAt: now,
|
|
31
|
+
updatedAt: now,
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
// ---------------------------------------------------------------------------
|
|
36
|
+
// Encryption constants and helpers (AES-256-GCM)
|
|
37
|
+
// ---------------------------------------------------------------------------
|
|
38
|
+
|
|
39
|
+
const ENCRYPTION_ALGORITHM = 'aes-256-gcm';
|
|
40
|
+
const KEY_LENGTH = 32;
|
|
41
|
+
const IV_LENGTH = 16;
|
|
42
|
+
const AUTH_TAG_LENGTH = 16;
|
|
43
|
+
const SALT = 'nimbus-auth-v1';
|
|
44
|
+
const ENC_PREFIX = 'enc:';
|
|
45
|
+
|
|
46
|
+
/**
|
|
47
|
+
* Build a machine-specific fingerprint from hostname, homedir, and username.
|
|
48
|
+
* This is not cryptographically perfect, but it prevents casual copy-paste of
|
|
49
|
+
* the auth file between machines.
|
|
50
|
+
*/
|
|
51
|
+
function getMachineFingerprint(): string {
|
|
52
|
+
const hostname = os.hostname();
|
|
53
|
+
const homedir = os.homedir();
|
|
54
|
+
const username = os.userInfo().username;
|
|
55
|
+
return `${hostname}${homedir}${username}`;
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
/**
|
|
59
|
+
* Derive a 256-bit encryption key from the machine fingerprint using PBKDF2.
|
|
60
|
+
*/
|
|
61
|
+
function deriveKey(): Buffer {
|
|
62
|
+
return crypto.pbkdf2Sync(getMachineFingerprint(), SALT, 100000, KEY_LENGTH, 'sha256');
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
/**
|
|
66
|
+
* Encrypt a plaintext string with AES-256-GCM.
|
|
67
|
+
* Returns a base64-encoded blob containing iv + authTag + ciphertext.
|
|
68
|
+
*/
|
|
69
|
+
function encryptValue(plaintext: string): string {
|
|
70
|
+
try {
|
|
71
|
+
const key = deriveKey();
|
|
72
|
+
const iv = crypto.randomBytes(IV_LENGTH);
|
|
73
|
+
const cipher = crypto.createCipheriv(ENCRYPTION_ALGORITHM, key, iv, {
|
|
74
|
+
authTagLength: AUTH_TAG_LENGTH,
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
const encrypted = Buffer.concat([cipher.update(plaintext, 'utf8'), cipher.final()]);
|
|
78
|
+
const authTag = cipher.getAuthTag();
|
|
79
|
+
|
|
80
|
+
// Layout: iv (16) + authTag (16) + ciphertext (variable)
|
|
81
|
+
const combined = Buffer.concat([iv, authTag, encrypted]);
|
|
82
|
+
return ENC_PREFIX + combined.toString('base64');
|
|
83
|
+
} catch {
|
|
84
|
+
// On any encryption error, return the original value so the system
|
|
85
|
+
// can continue to operate.
|
|
86
|
+
return plaintext;
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
/**
|
|
91
|
+
* Decrypt an encrypted value produced by encryptValue().
|
|
92
|
+
* If decryption fails (e.g. wrong machine, corrupted data, or the value was
|
|
93
|
+
* never encrypted), the original string is returned for backward compatibility.
|
|
94
|
+
*/
|
|
95
|
+
function decryptValue(encrypted: string): string {
|
|
96
|
+
try {
|
|
97
|
+
// Strip the enc: prefix
|
|
98
|
+
const payload = encrypted.slice(ENC_PREFIX.length);
|
|
99
|
+
const combined = Buffer.from(payload, 'base64');
|
|
100
|
+
|
|
101
|
+
if (combined.length < IV_LENGTH + AUTH_TAG_LENGTH) {
|
|
102
|
+
// Too short to be a valid encrypted payload -- return as-is
|
|
103
|
+
return encrypted;
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
const iv = combined.subarray(0, IV_LENGTH);
|
|
107
|
+
const authTag = combined.subarray(IV_LENGTH, IV_LENGTH + AUTH_TAG_LENGTH);
|
|
108
|
+
const ciphertext = combined.subarray(IV_LENGTH + AUTH_TAG_LENGTH);
|
|
109
|
+
|
|
110
|
+
const key = deriveKey();
|
|
111
|
+
const decipher = crypto.createDecipheriv(ENCRYPTION_ALGORITHM, key, iv, {
|
|
112
|
+
authTagLength: AUTH_TAG_LENGTH,
|
|
113
|
+
});
|
|
114
|
+
decipher.setAuthTag(authTag);
|
|
115
|
+
|
|
116
|
+
const decrypted = Buffer.concat([decipher.update(ciphertext), decipher.final()]);
|
|
117
|
+
|
|
118
|
+
return decrypted.toString('utf8');
|
|
119
|
+
} catch {
|
|
120
|
+
// Decryption failed -- could be a plain-text value from before encryption
|
|
121
|
+
// was introduced, or the file was moved between machines.
|
|
122
|
+
return encrypted;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
// ---------------------------------------------------------------------------
|
|
127
|
+
// Encryption helpers for the AuthFile structure
|
|
128
|
+
// ---------------------------------------------------------------------------
|
|
129
|
+
|
|
130
|
+
/**
|
|
131
|
+
* Deep-clone the auth file and encrypt sensitive fields before persistence.
|
|
132
|
+
*/
|
|
133
|
+
function encryptAuthFile(authFile: AuthFile): AuthFile {
|
|
134
|
+
const clone: AuthFile = JSON.parse(JSON.stringify(authFile));
|
|
135
|
+
|
|
136
|
+
// Encrypt provider API keys
|
|
137
|
+
for (const providerName of Object.keys(clone.providers) as LLMProviderName[]) {
|
|
138
|
+
const cred = clone.providers[providerName];
|
|
139
|
+
if (cred?.apiKey && cred.apiKey.length > 0 && !cred.apiKey.startsWith(ENC_PREFIX)) {
|
|
140
|
+
cred.apiKey = encryptValue(cred.apiKey);
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
// Encrypt GitHub access token
|
|
145
|
+
if (
|
|
146
|
+
clone.identity.github?.accessToken &&
|
|
147
|
+
clone.identity.github.accessToken.length > 0 &&
|
|
148
|
+
!clone.identity.github.accessToken.startsWith(ENC_PREFIX)
|
|
149
|
+
) {
|
|
150
|
+
clone.identity.github.accessToken = encryptValue(clone.identity.github.accessToken);
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
return clone;
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
/**
|
|
157
|
+
* Decrypt sensitive fields in an auth file that was loaded from disk.
|
|
158
|
+
* Plain-text values (from before encryption was added) pass through unchanged.
|
|
159
|
+
*/
|
|
160
|
+
function decryptAuthFile(authFile: AuthFile): AuthFile {
|
|
161
|
+
// Decrypt provider API keys
|
|
162
|
+
for (const providerName of Object.keys(authFile.providers) as LLMProviderName[]) {
|
|
163
|
+
const cred = authFile.providers[providerName];
|
|
164
|
+
if (cred?.apiKey && cred.apiKey.startsWith(ENC_PREFIX)) {
|
|
165
|
+
cred.apiKey = decryptValue(cred.apiKey);
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
// Decrypt GitHub access token
|
|
170
|
+
if (authFile.identity.github?.accessToken?.startsWith(ENC_PREFIX)) {
|
|
171
|
+
authFile.identity.github.accessToken = decryptValue(authFile.identity.github.accessToken);
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
return authFile;
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
/**
|
|
178
|
+
* AuthStore class for credential persistence
|
|
179
|
+
* Pattern follows state-service/src/config/manager.ts
|
|
180
|
+
*/
|
|
181
|
+
export class AuthStore {
|
|
182
|
+
private authPath: string;
|
|
183
|
+
private authFile: AuthFile | null = null;
|
|
184
|
+
|
|
185
|
+
constructor(authPath?: string) {
|
|
186
|
+
this.authPath = authPath || path.join(os.homedir(), '.nimbus', 'auth.json');
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
/**
|
|
190
|
+
* Get the path to the auth file
|
|
191
|
+
*/
|
|
192
|
+
getAuthPath(): string {
|
|
193
|
+
return this.authPath;
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
/**
|
|
197
|
+
* Ensure the auth directory exists
|
|
198
|
+
*/
|
|
199
|
+
private ensureDirectory(): void {
|
|
200
|
+
const dir = path.dirname(this.authPath);
|
|
201
|
+
if (!fs.existsSync(dir)) {
|
|
202
|
+
fs.mkdirSync(dir, { recursive: true, mode: 0o700 });
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
|
|
206
|
+
/**
|
|
207
|
+
* Load auth file from disk, creating if necessary.
|
|
208
|
+
* Encrypted values are transparently decrypted so all public accessors
|
|
209
|
+
* return plain-text credentials.
|
|
210
|
+
*/
|
|
211
|
+
load(): AuthFile {
|
|
212
|
+
if (this.authFile) {
|
|
213
|
+
return this.authFile;
|
|
214
|
+
}
|
|
215
|
+
|
|
216
|
+
this.ensureDirectory();
|
|
217
|
+
|
|
218
|
+
if (!fs.existsSync(this.authPath)) {
|
|
219
|
+
this.authFile = createEmptyAuthFile();
|
|
220
|
+
return this.authFile;
|
|
221
|
+
}
|
|
222
|
+
|
|
223
|
+
try {
|
|
224
|
+
const content = fs.readFileSync(this.authPath, 'utf-8');
|
|
225
|
+
const parsed = JSON.parse(content) as AuthFile;
|
|
226
|
+
|
|
227
|
+
// Validate version and migrate if needed
|
|
228
|
+
if (parsed.version !== AUTH_FILE_VERSION) {
|
|
229
|
+
// Future: handle migrations
|
|
230
|
+
parsed.version = AUTH_FILE_VERSION;
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
// Ensure required fields exist
|
|
234
|
+
parsed.identity = parsed.identity || {};
|
|
235
|
+
parsed.providers = parsed.providers || {};
|
|
236
|
+
|
|
237
|
+
// Decrypt sensitive fields (backward-compatible with plain-text files)
|
|
238
|
+
this.authFile = decryptAuthFile(parsed);
|
|
239
|
+
return this.authFile;
|
|
240
|
+
} catch {
|
|
241
|
+
// If file is corrupted, start fresh
|
|
242
|
+
this.authFile = createEmptyAuthFile();
|
|
243
|
+
return this.authFile;
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
/**
|
|
248
|
+
* Save auth file to disk with secure permissions (0600).
|
|
249
|
+
* Sensitive fields are encrypted before writing so they are never stored
|
|
250
|
+
* in plain text.
|
|
251
|
+
*/
|
|
252
|
+
save(authFile?: AuthFile): void {
|
|
253
|
+
this.ensureDirectory();
|
|
254
|
+
|
|
255
|
+
const fileToSave = authFile || this.authFile;
|
|
256
|
+
if (!fileToSave) {
|
|
257
|
+
throw new Error('No auth file to save');
|
|
258
|
+
}
|
|
259
|
+
|
|
260
|
+
fileToSave.updatedAt = new Date().toISOString();
|
|
261
|
+
this.authFile = fileToSave;
|
|
262
|
+
|
|
263
|
+
// Encrypt sensitive fields in a deep clone before writing to disk
|
|
264
|
+
const encrypted = encryptAuthFile(fileToSave);
|
|
265
|
+
const content = JSON.stringify(encrypted, null, 2);
|
|
266
|
+
fs.writeFileSync(this.authPath, content, { mode: 0o600 });
|
|
267
|
+
|
|
268
|
+
// Ensure permissions are set correctly even if file already existed
|
|
269
|
+
fs.chmodSync(this.authPath, 0o600);
|
|
270
|
+
}
|
|
271
|
+
|
|
272
|
+
/**
|
|
273
|
+
* Check if auth.json exists and has valid credentials
|
|
274
|
+
*/
|
|
275
|
+
exists(): boolean {
|
|
276
|
+
if (!fs.existsSync(this.authPath)) {
|
|
277
|
+
return false;
|
|
278
|
+
}
|
|
279
|
+
|
|
280
|
+
try {
|
|
281
|
+
const authFile = this.load();
|
|
282
|
+
// Consider it exists if there are any providers configured
|
|
283
|
+
return Object.keys(authFile.providers).length > 0;
|
|
284
|
+
} catch {
|
|
285
|
+
return false;
|
|
286
|
+
}
|
|
287
|
+
}
|
|
288
|
+
|
|
289
|
+
/**
|
|
290
|
+
* Get authentication status summary
|
|
291
|
+
*/
|
|
292
|
+
getStatus(): AuthStatus {
|
|
293
|
+
const authFile = this.load();
|
|
294
|
+
|
|
295
|
+
const hasIdentity = !!authFile.identity.github;
|
|
296
|
+
const providerEntries = Object.entries(authFile.providers) as Array<
|
|
297
|
+
[LLMProviderName, LLMProviderCredential]
|
|
298
|
+
>;
|
|
299
|
+
const hasProviders = providerEntries.length > 0;
|
|
300
|
+
|
|
301
|
+
const providers = providerEntries.map(([name, cred]) => ({
|
|
302
|
+
name,
|
|
303
|
+
model: cred.model,
|
|
304
|
+
isDefault: authFile.defaultProvider === name,
|
|
305
|
+
validatedAt: cred.validatedAt,
|
|
306
|
+
}));
|
|
307
|
+
|
|
308
|
+
return {
|
|
309
|
+
hasIdentity,
|
|
310
|
+
hasProviders,
|
|
311
|
+
isConfigured: hasProviders,
|
|
312
|
+
identity: hasIdentity
|
|
313
|
+
? {
|
|
314
|
+
provider: 'github' as const,
|
|
315
|
+
username: authFile.identity.github!.username,
|
|
316
|
+
name: authFile.identity.github!.name,
|
|
317
|
+
authenticatedAt: authFile.identity.github!.authenticatedAt,
|
|
318
|
+
}
|
|
319
|
+
: undefined,
|
|
320
|
+
providers,
|
|
321
|
+
defaultProvider: authFile.defaultProvider,
|
|
322
|
+
};
|
|
323
|
+
}
|
|
324
|
+
|
|
325
|
+
/**
|
|
326
|
+
* Set GitHub identity
|
|
327
|
+
*/
|
|
328
|
+
setIdentity(identity: GitHubIdentity): void {
|
|
329
|
+
const authFile = this.load();
|
|
330
|
+
authFile.identity.github = identity;
|
|
331
|
+
this.save(authFile);
|
|
332
|
+
}
|
|
333
|
+
|
|
334
|
+
/**
|
|
335
|
+
* Clear GitHub identity
|
|
336
|
+
*/
|
|
337
|
+
clearIdentity(): void {
|
|
338
|
+
const authFile = this.load();
|
|
339
|
+
delete authFile.identity.github;
|
|
340
|
+
this.save(authFile);
|
|
341
|
+
}
|
|
342
|
+
|
|
343
|
+
/**
|
|
344
|
+
* Get GitHub identity
|
|
345
|
+
*/
|
|
346
|
+
getIdentity(): GitHubIdentity | undefined {
|
|
347
|
+
const authFile = this.load();
|
|
348
|
+
return authFile.identity.github;
|
|
349
|
+
}
|
|
350
|
+
|
|
351
|
+
/**
|
|
352
|
+
* Set LLM provider credentials
|
|
353
|
+
*/
|
|
354
|
+
setProvider(name: LLMProviderName, credential: LLMProviderCredential): void {
|
|
355
|
+
const authFile = this.load();
|
|
356
|
+
authFile.providers[name] = credential;
|
|
357
|
+
|
|
358
|
+
// If this is the first provider or marked as default, set as default
|
|
359
|
+
if (credential.isDefault || Object.keys(authFile.providers).length === 1) {
|
|
360
|
+
authFile.defaultProvider = name;
|
|
361
|
+
}
|
|
362
|
+
|
|
363
|
+
this.save(authFile);
|
|
364
|
+
}
|
|
365
|
+
|
|
366
|
+
/**
|
|
367
|
+
* Remove LLM provider credentials
|
|
368
|
+
*/
|
|
369
|
+
removeProvider(name: LLMProviderName): void {
|
|
370
|
+
const authFile = this.load();
|
|
371
|
+
delete authFile.providers[name];
|
|
372
|
+
|
|
373
|
+
// If removed provider was default, set new default
|
|
374
|
+
if (authFile.defaultProvider === name) {
|
|
375
|
+
const remaining = Object.keys(authFile.providers) as LLMProviderName[];
|
|
376
|
+
authFile.defaultProvider = remaining.length > 0 ? remaining[0] : undefined;
|
|
377
|
+
}
|
|
378
|
+
|
|
379
|
+
this.save(authFile);
|
|
380
|
+
}
|
|
381
|
+
|
|
382
|
+
/**
|
|
383
|
+
* Get LLM provider credentials
|
|
384
|
+
*/
|
|
385
|
+
getProvider(name: LLMProviderName): LLMProviderCredential | undefined {
|
|
386
|
+
const authFile = this.load();
|
|
387
|
+
return authFile.providers[name];
|
|
388
|
+
}
|
|
389
|
+
|
|
390
|
+
/**
|
|
391
|
+
* Get all configured providers
|
|
392
|
+
*/
|
|
393
|
+
getProviders(): AuthFile['providers'] {
|
|
394
|
+
const authFile = this.load();
|
|
395
|
+
return authFile.providers;
|
|
396
|
+
}
|
|
397
|
+
|
|
398
|
+
/**
|
|
399
|
+
* Get API key for a provider
|
|
400
|
+
* Checks auth.json first, then falls back to environment variable
|
|
401
|
+
*/
|
|
402
|
+
getApiKey(name: LLMProviderName): string | undefined {
|
|
403
|
+
const provider = this.getProvider(name);
|
|
404
|
+
if (provider?.apiKey) {
|
|
405
|
+
return provider.apiKey;
|
|
406
|
+
}
|
|
407
|
+
|
|
408
|
+
// Environment variable fallback
|
|
409
|
+
const envVarMap: Record<LLMProviderName, string | undefined> = {
|
|
410
|
+
anthropic: process.env.ANTHROPIC_API_KEY,
|
|
411
|
+
openai: process.env.OPENAI_API_KEY,
|
|
412
|
+
google: process.env.GOOGLE_API_KEY,
|
|
413
|
+
openrouter: process.env.OPENROUTER_API_KEY,
|
|
414
|
+
groq: process.env.GROQ_API_KEY,
|
|
415
|
+
together: process.env.TOGETHER_API_KEY,
|
|
416
|
+
deepseek: process.env.DEEPSEEK_API_KEY,
|
|
417
|
+
fireworks: process.env.FIREWORKS_API_KEY,
|
|
418
|
+
perplexity: process.env.PERPLEXITY_API_KEY,
|
|
419
|
+
ollama: undefined, // Ollama doesn't use API keys
|
|
420
|
+
bedrock: process.env.AWS_ACCESS_KEY_ID, // Bedrock uses AWS IAM credentials
|
|
421
|
+
};
|
|
422
|
+
|
|
423
|
+
return envVarMap[name];
|
|
424
|
+
}
|
|
425
|
+
|
|
426
|
+
/**
|
|
427
|
+
* Get base URL for a provider (primarily for Ollama)
|
|
428
|
+
*/
|
|
429
|
+
getBaseUrl(name: LLMProviderName): string | undefined {
|
|
430
|
+
const provider = this.getProvider(name);
|
|
431
|
+
if (provider?.baseUrl) {
|
|
432
|
+
return provider.baseUrl;
|
|
433
|
+
}
|
|
434
|
+
|
|
435
|
+
// Environment variable fallback
|
|
436
|
+
if (name === 'ollama') {
|
|
437
|
+
return process.env.OLLAMA_BASE_URL;
|
|
438
|
+
}
|
|
439
|
+
|
|
440
|
+
return undefined;
|
|
441
|
+
}
|
|
442
|
+
|
|
443
|
+
/**
|
|
444
|
+
* Set the default LLM provider
|
|
445
|
+
*/
|
|
446
|
+
setDefaultProvider(name: LLMProviderName): void {
|
|
447
|
+
const authFile = this.load();
|
|
448
|
+
|
|
449
|
+
if (!authFile.providers[name]) {
|
|
450
|
+
throw new Error(`Provider ${name} is not configured`);
|
|
451
|
+
}
|
|
452
|
+
|
|
453
|
+
authFile.defaultProvider = name;
|
|
454
|
+
this.save(authFile);
|
|
455
|
+
}
|
|
456
|
+
|
|
457
|
+
/**
|
|
458
|
+
* Get the default LLM provider
|
|
459
|
+
*/
|
|
460
|
+
getDefaultProvider(): LLMProviderName | undefined {
|
|
461
|
+
const authFile = this.load();
|
|
462
|
+
return authFile.defaultProvider;
|
|
463
|
+
}
|
|
464
|
+
|
|
465
|
+
/**
|
|
466
|
+
* Clear all credentials (logout)
|
|
467
|
+
*/
|
|
468
|
+
clear(): void {
|
|
469
|
+
this.authFile = null;
|
|
470
|
+
|
|
471
|
+
if (fs.existsSync(this.authPath)) {
|
|
472
|
+
fs.unlinkSync(this.authPath);
|
|
473
|
+
}
|
|
474
|
+
}
|
|
475
|
+
|
|
476
|
+
/**
|
|
477
|
+
* Mask an API key for display (e.g., "sk-ant-...xyz4")
|
|
478
|
+
*/
|
|
479
|
+
static maskApiKey(key: string | undefined): string {
|
|
480
|
+
if (!key) {
|
|
481
|
+
return '(not set)';
|
|
482
|
+
}
|
|
483
|
+
|
|
484
|
+
if (key.length <= 8) {
|
|
485
|
+
return '****';
|
|
486
|
+
}
|
|
487
|
+
|
|
488
|
+
const prefix = key.slice(0, 7);
|
|
489
|
+
const suffix = key.slice(-4);
|
|
490
|
+
return `${prefix}...${suffix}`;
|
|
491
|
+
}
|
|
492
|
+
|
|
493
|
+
/**
|
|
494
|
+
* Reload auth file from disk (discard cached version)
|
|
495
|
+
*/
|
|
496
|
+
reload(): AuthFile {
|
|
497
|
+
this.authFile = null;
|
|
498
|
+
return this.load();
|
|
499
|
+
}
|
|
500
|
+
}
|
|
501
|
+
|
|
502
|
+
/**
|
|
503
|
+
* Singleton instance for global access
|
|
504
|
+
*/
|
|
505
|
+
export const authStore = new AuthStore();
|
|
@@ -0,0 +1,187 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Authentication Types
|
|
3
|
+
* Type definitions for the Nimbus CLI authentication system
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* LLM Provider identifiers
|
|
8
|
+
*
|
|
9
|
+
* Core providers have full onboarding/login support.
|
|
10
|
+
* Extended providers (OpenAI-compatible) can be persisted to auth.json
|
|
11
|
+
* and configured via `nimbus login`, but use generic OpenAI validation.
|
|
12
|
+
*/
|
|
13
|
+
export type LLMProviderName =
|
|
14
|
+
| 'anthropic'
|
|
15
|
+
| 'openai'
|
|
16
|
+
| 'google'
|
|
17
|
+
| 'openrouter'
|
|
18
|
+
| 'ollama'
|
|
19
|
+
| 'groq'
|
|
20
|
+
| 'together'
|
|
21
|
+
| 'deepseek'
|
|
22
|
+
| 'fireworks'
|
|
23
|
+
| 'perplexity'
|
|
24
|
+
| 'bedrock';
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* GitHub identity information from OAuth
|
|
28
|
+
*/
|
|
29
|
+
export interface GitHubIdentity {
|
|
30
|
+
username: string;
|
|
31
|
+
name: string | null;
|
|
32
|
+
email: string | null;
|
|
33
|
+
avatarUrl: string | null;
|
|
34
|
+
accessToken: string;
|
|
35
|
+
authenticatedAt: string;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
* LLM Provider credential configuration
|
|
40
|
+
*/
|
|
41
|
+
export interface LLMProviderCredential {
|
|
42
|
+
apiKey?: string;
|
|
43
|
+
baseUrl?: string;
|
|
44
|
+
model: string;
|
|
45
|
+
validatedAt?: string;
|
|
46
|
+
isDefault?: boolean;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
/**
|
|
50
|
+
* Identity section of auth file
|
|
51
|
+
*/
|
|
52
|
+
export interface AuthIdentity {
|
|
53
|
+
github?: GitHubIdentity;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/**
|
|
57
|
+
* Providers section of auth file - map of provider name to credential
|
|
58
|
+
*/
|
|
59
|
+
export type AuthProviders = Partial<Record<LLMProviderName, LLMProviderCredential>>;
|
|
60
|
+
|
|
61
|
+
/**
|
|
62
|
+
* Complete auth file schema stored at ~/.nimbus/auth.json
|
|
63
|
+
*/
|
|
64
|
+
export interface AuthFile {
|
|
65
|
+
version: number;
|
|
66
|
+
identity: AuthIdentity;
|
|
67
|
+
providers: AuthProviders;
|
|
68
|
+
defaultProvider?: LLMProviderName;
|
|
69
|
+
createdAt: string;
|
|
70
|
+
updatedAt: string;
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
/**
|
|
74
|
+
* Auth status summary for display
|
|
75
|
+
*/
|
|
76
|
+
export interface AuthStatus {
|
|
77
|
+
hasIdentity: boolean;
|
|
78
|
+
hasProviders: boolean;
|
|
79
|
+
isConfigured: boolean;
|
|
80
|
+
identity?: {
|
|
81
|
+
provider: 'github';
|
|
82
|
+
username: string;
|
|
83
|
+
name: string | null;
|
|
84
|
+
authenticatedAt: string;
|
|
85
|
+
};
|
|
86
|
+
providers: Array<{
|
|
87
|
+
name: LLMProviderName;
|
|
88
|
+
model: string;
|
|
89
|
+
isDefault: boolean;
|
|
90
|
+
validatedAt?: string;
|
|
91
|
+
}>;
|
|
92
|
+
defaultProvider?: LLMProviderName;
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
/**
|
|
96
|
+
* Login wizard context - accumulated state through wizard steps
|
|
97
|
+
*/
|
|
98
|
+
export interface LoginWizardContext {
|
|
99
|
+
// GitHub identity step
|
|
100
|
+
skipGitHub?: boolean;
|
|
101
|
+
githubIdentity?: GitHubIdentity;
|
|
102
|
+
|
|
103
|
+
// Provider configuration step (can have multiple)
|
|
104
|
+
configuredProviders: Array<{
|
|
105
|
+
name: LLMProviderName;
|
|
106
|
+
apiKey?: string;
|
|
107
|
+
baseUrl?: string;
|
|
108
|
+
model: string;
|
|
109
|
+
}>;
|
|
110
|
+
|
|
111
|
+
// Default provider step
|
|
112
|
+
defaultProvider?: LLMProviderName;
|
|
113
|
+
|
|
114
|
+
// Completion state
|
|
115
|
+
completed?: boolean;
|
|
116
|
+
cancelled?: boolean;
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
/**
|
|
120
|
+
* Provider metadata for registry
|
|
121
|
+
*/
|
|
122
|
+
export interface ProviderInfo {
|
|
123
|
+
name: LLMProviderName;
|
|
124
|
+
displayName: string;
|
|
125
|
+
description: string;
|
|
126
|
+
envVarName?: string;
|
|
127
|
+
apiKeyUrl?: string;
|
|
128
|
+
models: Array<{
|
|
129
|
+
id: string;
|
|
130
|
+
name: string;
|
|
131
|
+
isDefault?: boolean;
|
|
132
|
+
}>;
|
|
133
|
+
requiresApiKey: boolean;
|
|
134
|
+
supportsBaseUrl?: boolean;
|
|
135
|
+
defaultBaseUrl?: string;
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
/**
|
|
139
|
+
* GitHub OAuth device flow response
|
|
140
|
+
*/
|
|
141
|
+
export interface GitHubDeviceCodeResponse {
|
|
142
|
+
device_code: string;
|
|
143
|
+
user_code: string;
|
|
144
|
+
verification_uri: string;
|
|
145
|
+
expires_in: number;
|
|
146
|
+
interval: number;
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
/**
|
|
150
|
+
* GitHub OAuth access token response
|
|
151
|
+
*/
|
|
152
|
+
export interface GitHubAccessTokenResponse {
|
|
153
|
+
access_token?: string;
|
|
154
|
+
token_type?: string;
|
|
155
|
+
scope?: string;
|
|
156
|
+
error?: string;
|
|
157
|
+
error_description?: string;
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
/**
|
|
161
|
+
* GitHub user profile response
|
|
162
|
+
*/
|
|
163
|
+
export interface GitHubUserResponse {
|
|
164
|
+
login: string;
|
|
165
|
+
name: string | null;
|
|
166
|
+
email: string | null;
|
|
167
|
+
avatar_url: string;
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
/**
|
|
171
|
+
* GitHub user email response
|
|
172
|
+
*/
|
|
173
|
+
export interface GitHubEmailResponse {
|
|
174
|
+
email: string;
|
|
175
|
+
primary: boolean;
|
|
176
|
+
verified: boolean;
|
|
177
|
+
visibility: string | null;
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
/**
|
|
181
|
+
* Provider validation result
|
|
182
|
+
*/
|
|
183
|
+
export interface ProviderValidationResult {
|
|
184
|
+
valid: boolean;
|
|
185
|
+
error?: string;
|
|
186
|
+
models?: string[];
|
|
187
|
+
}
|