@supersdk/supercli 0.2.1-staging.20 → 0.3.0-staging.22

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.
Files changed (91) hide show
  1. package/dist/api/consoleClient.js +17 -12
  2. package/dist/api/consoleClient.js.map +1 -1
  3. package/dist/auth/browserAuth.js +42 -44
  4. package/dist/auth/browserAuth.js.map +1 -1
  5. package/dist/auth/tokenAuth.js +46 -0
  6. package/dist/auth/tokenAuth.js.map +1 -0
  7. package/dist/cli.js +70 -8
  8. package/dist/cli.js.map +1 -1
  9. package/dist/commands/accounts.js +89 -31
  10. package/dist/commands/accounts.js.map +1 -1
  11. package/dist/commands/add.js +519 -0
  12. package/dist/commands/add.js.map +1 -0
  13. package/dist/commands/init.js +234 -0
  14. package/dist/commands/init.js.map +1 -0
  15. package/dist/commands/login.js +75 -48
  16. package/dist/commands/login.js.map +1 -1
  17. package/dist/commands/logout.js +20 -25
  18. package/dist/commands/logout.js.map +1 -1
  19. package/dist/commands/publishSite.js +491 -149
  20. package/dist/commands/publishSite.js.map +1 -1
  21. package/dist/commands/switchaccount.js +36 -24
  22. package/dist/commands/switchaccount.js.map +1 -1
  23. package/dist/config/appConfig.js +160 -45
  24. package/dist/config/appConfig.js.map +1 -1
  25. package/dist/config/environments.js +17 -1
  26. package/dist/config/environments.js.map +1 -1
  27. package/dist/exit/exitCodes.js +55 -0
  28. package/dist/exit/exitCodes.js.map +1 -0
  29. package/dist/output/envelope.js +104 -0
  30. package/dist/output/envelope.js.map +1 -0
  31. package/dist/output/resultPrinter.js +70 -0
  32. package/dist/output/resultPrinter.js.map +1 -0
  33. package/dist/publish/siteClient.js +14 -4
  34. package/dist/publish/siteClient.js.map +1 -1
  35. package/dist/publish/siteConfig.js +278 -63
  36. package/dist/publish/siteConfig.js.map +1 -1
  37. package/dist/store/accountStore.js +2 -2
  38. package/dist/store/accountStore.js.map +1 -1
  39. package/dist/store/backends/encryptedFile.js +4 -1
  40. package/dist/store/backends/encryptedFile.js.map +1 -1
  41. package/dist/store/backends/osKeyring.js +4 -8
  42. package/dist/store/backends/osKeyring.js.map +1 -1
  43. package/dist/store/credentialStore.js +22 -0
  44. package/dist/store/credentialStore.js.map +1 -1
  45. package/dist/template/README.md +144 -85
  46. package/dist/template/android/app/build.gradle.kts +0 -3
  47. package/dist/template/android/app/src/main/java/com/supersdk/simple/EnvironmentStore.java +41 -0
  48. package/dist/template/android/app/src/main/java/com/supersdk/simple/MainActivity.java +57 -4
  49. package/dist/template/android/app/src/main/java/com/supersdk/simple/SimpleApplication.java +3 -1
  50. package/dist/template/android/gradle/supersdk-config-reader.gradle +5 -3
  51. package/dist/template/android/supersdk-default.config.json +4 -3
  52. package/dist/template/ios/Sources/App/EnvironmentStore.swift +35 -0
  53. package/dist/template/ios/Sources/App/SimpleSDKBootstrap.swift +2 -1
  54. package/dist/template/ios/Sources/App/SimpleSDKProbe.swift +15 -0
  55. package/dist/template/ios/Sources/App/SimpleViewController.swift +52 -8
  56. package/dist/template/ios/Tests/SimpleAppTests/SimpleSDKInitializationTests.swift +12 -1
  57. package/dist/template/scripts/android_snapshot_canary.py +17 -8
  58. package/dist/template/scripts/build_android.sh +36 -9
  59. package/dist/template/scripts/build_ios.sh +63 -24
  60. package/dist/template/scripts/build_site.sh +43 -0
  61. package/dist/template/scripts/lib/workspace.sh +43 -0
  62. package/dist/template/scripts/serve_web.py +26 -9
  63. package/dist/template/scripts/super_build_orchestrator.py +49 -28
  64. package/dist/template/scripts/supersdk_template.py +759 -240
  65. package/dist/template/scripts/web_package.py +44 -20
  66. package/dist/template/super_build.sh +40 -12
  67. package/dist/template/supersdk.json +25 -13
  68. package/dist/template/template_manifest.json +25 -0
  69. package/dist/template/web/src/css/style.css +28 -0
  70. package/dist/template/web/src/index.html +8 -0
  71. package/dist/template/web/src/js/app.js +92 -19
  72. package/dist/util/log.js +10 -1
  73. package/dist/util/log.js.map +1 -1
  74. package/dist/util/prompt.js +25 -0
  75. package/dist/util/prompt.js.map +1 -1
  76. package/dist/workspace/config.js +440 -0
  77. package/dist/workspace/config.js.map +1 -0
  78. package/dist/workspace/identity.js +106 -0
  79. package/dist/workspace/identity.js.map +1 -0
  80. package/dist/workspace/interactive.js +96 -0
  81. package/dist/workspace/interactive.js.map +1 -0
  82. package/dist/workspace/template.js +357 -0
  83. package/dist/workspace/template.js.map +1 -0
  84. package/package.json +1 -1
  85. package/dist/auth/refresh.js +0 -32
  86. package/dist/auth/refresh.js.map +0 -1
  87. package/dist/commands/createApp.js +0 -448
  88. package/dist/commands/createApp.js.map +0 -1
  89. package/dist/createApp/copyTemplate.js +0 -561
  90. package/dist/createApp/copyTemplate.js.map +0 -1
  91. package/dist/template/scripts/build_web.sh +0 -12
@@ -0,0 +1,234 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
35
+ Object.defineProperty(exports, "__esModule", { value: true });
36
+ exports.runInit = runInit;
37
+ exports.registerInitCommand = registerInitCommand;
38
+ const fs = __importStar(require("node:fs"));
39
+ const path = __importStar(require("node:path"));
40
+ const appConfig_1 = require("../config/appConfig");
41
+ const log_1 = require("../util/log");
42
+ const prompt_1 = require("../util/prompt");
43
+ const shell_1 = require("../util/shell");
44
+ const config_1 = require("../workspace/config");
45
+ const identity_1 = require("../workspace/identity");
46
+ const interactive_1 = require("../workspace/interactive");
47
+ const template_1 = require("../workspace/template");
48
+ /**
49
+ * 「去 add 一个项目」的指路命令。类型是占位符,所以**必须带引号** —— 裸
50
+ * `supercli add <android|ios|site> <dir>` 粘进 bash 会被当成重定向和管道,人看到的是
51
+ * `No such file or directory` 之类跟本意毫无关系的报错;带引号则原样进到命令自己的
52
+ * 「unknown project type」校验里,那才是他需要看到的下一步。
53
+ */
54
+ function addPlaceholderCommand(dirArg) {
55
+ const dir = dirArg !== undefined ? (0, shell_1.shellQuote)(dirArg) : (0, shell_1.shellQuote)('<dir>');
56
+ return `supercli add ${(0, shell_1.shellQuote)(`<${template_1.PROJECT_TYPE_NAMES.join('|')}>`)} ${dir} ...`;
57
+ }
58
+ function suggestedCommand(target, spid, name) {
59
+ const parts = ['supercli init', (0, shell_1.shellQuote)(target)];
60
+ parts.push('--spid', spid ? (0, shell_1.shellQuote)(spid) : (0, shell_1.shellQuote)(`<${identity_1.SPID_PATTERN_SOURCE}>`));
61
+ if (name)
62
+ parts.push('--name', (0, shell_1.shellQuote)(name));
63
+ return parts.join(' ');
64
+ }
65
+ function failureMessage(target, interactive, resolution, resolvedSpid, resolvedName) {
66
+ const lines = [];
67
+ if (resolution.errors.length > 0) {
68
+ lines.push('invalid init arguments:');
69
+ for (const error of resolution.errors)
70
+ lines.push(` - ${error}`);
71
+ }
72
+ if (resolution.missingFlags.length > 0) {
73
+ lines.push((0, interactive_1.missingFlagsHeadline)('supercli init', interactive, resolution.missingFlags));
74
+ }
75
+ lines.push('', 'Re-run with the values spelled out:', '', ` ${suggestedCommand(target, resolvedSpid, resolvedName)}`, '', 'Flags:', ` --spid <spid> required, 8 lowercase letters/digits (${identity_1.SPID_PATTERN_SOURCE}) issued by Console. ` +
76
+ 'It is never derived and never guessed — one workspace is exactly one spid.', ' --name <name> optional workspace description; defaults to the target directory name. ' +
77
+ 'It is a description only and is NEVER used as an App label — android/ios projects carry their own --name.');
78
+ return lines.join('\n');
79
+ }
80
+ function summary(target, spid, name, created, kept, missingInTemplate) {
81
+ const lines = [
82
+ `initialized workspace at ${target}`,
83
+ `spid: ${spid}`,
84
+ `name: ${name ?? '(unset)'}`,
85
+ `config: ${path.join(target, config_1.CONFIG_FILENAME)} (schemaVersion ${appConfig_1.APP_CONFIG_SCHEMA_VERSION}, projects: [])`,
86
+ `shared: ${created.length > 0 ? created.join(', ') : '(none written)'}`,
87
+ ];
88
+ // 「已存在所以跳过」必须说出来:静默跳过会让人以为拿到的是模板里的那一份。
89
+ if (kept.length > 0)
90
+ lines.push(`kept (already present, not overwritten): ${kept.join(', ')}`);
91
+ if (missingInTemplate.length > 0)
92
+ lines.push(`not in the template, skipped: ${missingInTemplate.join(', ')}`);
93
+ lines.push('', 'next — register a project directory for each platform you need:', ` cd ${(0, shell_1.shellQuote)(target)}`, " supercli add android apps/android --package com.acme.myapp --name 'My App'", " supercli add ios apps/ios --bundle-id com.acme.myapp --name 'My App'", ' supercli add site apps/web --slug myapp', '', `project types: ${template_1.PROJECT_TYPE_NAMES.join(' | ')}`);
94
+ return lines.join('\n');
95
+ }
96
+ /**
97
+ * Core init logic, decoupled from commander (logout.ts:54 pattern) so it can be
98
+ * exercised directly in unit/integration tests against a fixture template.
99
+ */
100
+ async function runInit(dirArg, opts, deps = {}) {
101
+ const target = path.resolve(dirArg ?? '.');
102
+ const configPath = path.join(target, config_1.CONFIG_FILENAME);
103
+ // 退役 YAML 方言优先 fail-closed:权威侧 load_config 也是先扫旧文件再读 supersdk.json。
104
+ const legacy = (0, config_1.legacyConfigIn)(target);
105
+ if (legacy) {
106
+ return { ok: false, message: (0, config_1.legacyMigrationMessage)(legacy, (0, config_1.isValidConfigFile)(configPath)) };
107
+ }
108
+ // 🔴 已经是工作空间就绝不覆写:覆盖会把已登记的 projects[](以及发布侧回填的 orgId)整份抹掉。
109
+ if (fs.existsSync(configPath)) {
110
+ return {
111
+ ok: false,
112
+ message: `${configPath} already exists — ${target} is already a workspace, and \`supercli init\` never ` +
113
+ 'overwrites one (that would drop every registered project and the orgId backfilled by publish-site).\n' +
114
+ `Register a project instead:\n\n cd ${(0, shell_1.shellQuote)(target)}\n ${addPlaceholderCommand()}`,
115
+ };
116
+ }
117
+ // 🔴 嵌套工作空间必须硬失败,不能只是「不覆盖就算了」。findConfig 是「向上找到第一份就停」,
118
+ // 所以内层的 supersdk.json 会**遮蔽**外层:此后每一次 add / publish-site 都悄悄绑到内层那个
119
+ // spid 上,两份配置各自漂移、共享物各存一份,全程零告警。add 早就把「项目目录不得互为祖先」
120
+ // 当硬失败,init 不查就是在同一棵树上给了两套判据。
121
+ const enclosing = (0, config_1.findEnclosingWorkspace)(target);
122
+ if (enclosing !== undefined) {
123
+ const enclosingRoot = path.dirname(enclosing);
124
+ const inner = (0, config_1.relativeToRoot)(enclosingRoot, target);
125
+ return {
126
+ ok: false,
127
+ message: `${target} sits inside the workspace rooted at ${enclosingRoot} (${enclosing}), and a workspace must never ` +
128
+ 'contain another one: the inner config shadows the outer for every `supercli add` and `supercli publish-site` ' +
129
+ 'run below it, so the two spids drift apart without a single warning.\n' +
130
+ `Register this directory as a project of the workspace that already owns it:\n\n` +
131
+ ` cd ${(0, shell_1.shellQuote)(enclosingRoot)}\n` +
132
+ ` ${addPlaceholderCommand(inner)}\n\n` +
133
+ `If it genuinely has to be a separate workspace with its own spid, create it outside ${enclosingRoot}.`,
134
+ };
135
+ }
136
+ let templateRoot;
137
+ try {
138
+ templateRoot = deps.templateRoot ?? (0, template_1.locateDefaultTemplateRoot)();
139
+ }
140
+ catch (err) {
141
+ return { ok: false, message: err.message };
142
+ }
143
+ if (!fs.existsSync(templateRoot)) {
144
+ return { ok: false, message: `template root not found at "${templateRoot}"` };
145
+ }
146
+ // Asked last, so the user is never interrogated for a run that was going to fail
147
+ // on an existing config or a missing template anyway.
148
+ const interactive = (deps.isInteractive ?? prompt_1.isInteractiveStdin)();
149
+ const prompt = deps.prompt ?? prompt_1.promptLineWithDefaultSync;
150
+ const resolution = (0, interactive_1.newResolution)();
151
+ const spid = (0, interactive_1.resolveValue)(resolution, interactive, prompt, {
152
+ flag: '--spid',
153
+ question: 'Project spid (8 characters, issued by Console)',
154
+ provided: (0, interactive_1.trimFlag)(opts.spid),
155
+ check: identity_1.checkSpid,
156
+ required: true,
157
+ });
158
+ const name = (0, interactive_1.resolveValue)(resolution, interactive, prompt, {
159
+ flag: '--name',
160
+ question: 'Workspace name (a description only — never used as an App label)',
161
+ provided: (0, interactive_1.trimFlag)(opts.name),
162
+ fallback: path.basename(target) || undefined,
163
+ check: identity_1.checkName,
164
+ required: false,
165
+ askWhenOptional: true,
166
+ });
167
+ if (resolution.errors.length > 0 || resolution.missingFlags.length > 0 || spid === undefined) {
168
+ return { ok: false, message: failureMessage(target, interactive, resolution, spid, name) };
169
+ }
170
+ // 共享物先落地:它是**幂等且绝不覆盖**的,即使随后写配置失败,重跑 init 也不会丢东西。
171
+ // 反过来(先写配置)失败时,下一次 init 会被「already a workspace」挡住,人就卡住了。
172
+ let shared;
173
+ try {
174
+ const { manifest } = (0, template_1.loadTemplateManifest)(templateRoot);
175
+ fs.mkdirSync(target, { recursive: true });
176
+ shared = (0, template_1.ensureWorkspaceShared)(target, templateRoot, manifest);
177
+ }
178
+ catch (err) {
179
+ return { ok: false, message: `failed to write the workspace shared files: ${err.message}` };
180
+ }
181
+ const templateDefaults = (0, template_1.readTemplateDefaults)(templateRoot);
182
+ const document = {
183
+ schemaVersion: appConfig_1.APP_CONFIG_SCHEMA_VERSION,
184
+ spid,
185
+ ...(name !== undefined ? { name } : {}),
186
+ // version / sdk 是 workspace 级**默认**(项目级可整值覆盖)。取自模板而不是硬编码:
187
+ // sdk.androidVersion 会随 SDK 发版变化,写死一份必然腐烂。
188
+ ...(templateDefaults.version ? { version: templateDefaults.version } : {}),
189
+ ...(templateDefaults.sdk ? { sdk: templateDefaults.sdk } : {}),
190
+ projects: [],
191
+ };
192
+ try {
193
+ (0, config_1.createWorkspaceConfig)(configPath, document);
194
+ }
195
+ catch (err) {
196
+ return { ok: false, message: `failed to write ${configPath}: ${err.message}` };
197
+ }
198
+ // 模板没给 version/sdk 时必须**明说**:android 构建缺 sdk.androidVersion 会在
199
+ // require_android_config 处失败,而那个报错完全指不到「你的工作空间没有默认值」。
200
+ if (!templateDefaults.version || !templateDefaults.sdk) {
201
+ const absent = [!templateDefaults.version ? 'version' : undefined, !templateDefaults.sdk ? 'sdk' : undefined]
202
+ .filter((entry) => entry !== undefined)
203
+ .join(', ');
204
+ log_1.log.warn(`the built-in template carries no workspace defaults for: ${absent} — ` +
205
+ `add them to ${configPath} by hand before building (android needs sdk.androidVersion)`);
206
+ }
207
+ return {
208
+ ok: true,
209
+ message: summary(target, spid, name, shared.created, shared.kept, shared.missingInTemplate),
210
+ root: target,
211
+ configPath,
212
+ spid,
213
+ ...(name !== undefined ? { name } : {}),
214
+ sharedCreated: shared.created,
215
+ sharedKept: shared.kept,
216
+ };
217
+ }
218
+ function registerInitCommand(program) {
219
+ program
220
+ .command('init [dir]')
221
+ .description('Create a SuperSDK workspace (supersdk.json + shared build files) in dir (default: .).')
222
+ .option('--spid <spid>', '8-character project spid issued by the SuperSDK Console (required; never derived)')
223
+ .option('--name <name>', 'workspace description; defaults to the directory name. Never used as an App label')
224
+ .action(async (dirArg, opts) => {
225
+ const result = await runInit(dirArg, opts);
226
+ if (!result.ok) {
227
+ log_1.log.error(result.message);
228
+ process.exitCode = 1;
229
+ return;
230
+ }
231
+ log_1.log.info(result.message);
232
+ });
233
+ }
234
+ //# sourceMappingURL=init.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"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"}
@@ -1,20 +1,86 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.runLogin = runLogin;
3
4
  exports.registerLoginCommand = registerLoginCommand;
4
5
  const consoleClient_1 = require("../api/consoleClient");
5
6
  const browserAuth_1 = require("../auth/browserAuth");
6
7
  const environments_1 = require("../config/environments");
7
8
  const credentialStore_1 = require("../store/credentialStore");
8
- const log_1 = require("../util/log");
9
+ const resultPrinter_1 = require("../output/resultPrinter");
9
10
  const prompt_1 = require("../util/prompt");
10
- // 授权页把 cli_version 展示给真人看,是他判断「我在批准什么」的线索之一,必须是 supercli
11
- // **自己**的版本。原先取 process.env.npm_package_version —— 那是「当前 npm 脚本所属包」
12
- // 的版本:全局安装直接跑时它没有值(显示 0.0.0),在业务工程里经 npm run xxx 调用时显示的
13
- // 是那个业务工程的版本。
11
+ // 授权页把 cli_version 展示给真人看,必须是 supercli **自己**的版本(不是 npm_package_version)。
14
12
  // eslint-disable-next-line @typescript-eslint/no-var-requires
15
13
  const pkg = require('../../package.json');
16
14
  /** --credential-backend 的合法取值,与 --help 文案同源。 */
17
15
  const CREDENTIAL_BACKENDS = ['os-keyring', 'encrypted-file'];
16
+ const defaultLoginRunDeps = {
17
+ performLogin: browserAuth_1.login,
18
+ selectBackend: credentialStore_1.selectCredentialBackend,
19
+ createClient: (apiOrigin) => new consoleClient_1.ConsoleClient(apiOrigin),
20
+ isNonInteractive: prompt_1.isNonInteractive,
21
+ };
22
+ /**
23
+ * Core login flow (AC-2/AC-4). In a non-interactive session (`--output json` or
24
+ * `--no-input`) it fails fast WITHOUT touching stdin — an Agent must never hang
25
+ * on the browser-paste prompt; the message points at SUPERCLI_TOKEN (TC-006/007).
26
+ */
27
+ async function runLogin(opts, deps = {}) {
28
+ const d = { ...defaultLoginRunDeps, ...deps };
29
+ if (d.isNonInteractive()) {
30
+ return {
31
+ ok: false,
32
+ kind: 'usage_error',
33
+ message: 'login is interactive (browser authorization + paste a code) and cannot run under --output json / --no-input; ' +
34
+ 'set SUPERCLI_TOKEN to a token from a prior interactive `supercli login` to run unattended',
35
+ };
36
+ }
37
+ try {
38
+ const env = (0, environments_1.resolveEnvironment)({
39
+ environment: opts.environment,
40
+ apiOrigin: opts.apiOrigin,
41
+ webOrigin: opts.webOrigin,
42
+ });
43
+ // 🔴 必须校验枚举(origin/staging 修复并入 runLogin):拼错一个字母(encrypted-fil)
44
+ // 会**静默**回落到系统钥匙串,用户以为凭据进了口令加密文件。返回 usage_error 而非静默。
45
+ if (opts.credentialBackend !== undefined && !CREDENTIAL_BACKENDS.includes(opts.credentialBackend)) {
46
+ return {
47
+ ok: false,
48
+ kind: 'usage_error',
49
+ message: `invalid --credential-backend "${opts.credentialBackend}" (expected ${CREDENTIAL_BACKENDS.join('|')})`,
50
+ };
51
+ }
52
+ const allowEncryptedFallback = opts.credentialBackend === 'encrypted-file';
53
+ const backend = d.selectBackend({
54
+ allowEncryptedFallback,
55
+ passphraseProvider: allowEncryptedFallback
56
+ ? () => (0, prompt_1.promptHiddenSync)('Encryption passphrase (for the local credential vault): ')
57
+ : undefined,
58
+ });
59
+ const client = d.createClient(env.apiOrigin);
60
+ const result = await d.performLogin({
61
+ client,
62
+ backend,
63
+ env,
64
+ openBrowser: browserAuth_1.defaultOpenBrowser,
65
+ promptCode: () => (0, prompt_1.promptLineSync)('Paste the authorization code from your browser: '),
66
+ cliVersion: pkg.version,
67
+ });
68
+ if (!result.ok) {
69
+ return { ok: false, kind: 'business_error', message: result.message ?? 'login failed' };
70
+ }
71
+ return {
72
+ ok: true,
73
+ result: { accountKey: result.account?.accountKey, env: env.label, org: result.account?.orgId },
74
+ humanMessage: `logged in as ${result.account?.accountKey} (${env.label})`,
75
+ };
76
+ }
77
+ catch (err) {
78
+ if (err instanceof prompt_1.NonInteractiveError) {
79
+ return { ok: false, kind: 'usage_error', message: err.message };
80
+ }
81
+ return { ok: false, kind: 'business_error', message: `login error: ${err.message}` };
82
+ }
83
+ }
18
84
  function registerLoginCommand(program) {
19
85
  program
20
86
  .command('login')
@@ -23,49 +89,10 @@ function registerLoginCommand(program) {
23
89
  .option('--api-origin <url>', 'custom Console API origin (implies a custom environment)')
24
90
  .option('--web-origin <url>', 'custom Console web origin (defaults to --api-origin, custom only)')
25
91
  .option('--credential-backend <backend>', 'os-keyring (default) or encrypted-file')
26
- .action(async (opts) => {
27
- try {
28
- const env = (0, environments_1.resolveEnvironment)({
29
- environment: opts.environment,
30
- apiOrigin: opts.apiOrigin,
31
- webOrigin: opts.webOrigin,
32
- });
33
- // 🔴 必须校验枚举:原先只做 `=== 'encrypted-file'` 等值判断,于是拼错一个字母
34
- // (encrypted_file / encrypted-fil)会**静默**回落到系统钥匙串 —— 用户以为凭据进了
35
- // 口令加密文件,实际进了 OS keyring,全程零提示。同一 CLI 的 --environment /
36
- // --channel / --platform 都是严格校验的,这里不该例外。
37
- if (opts.credentialBackend !== undefined && !CREDENTIAL_BACKENDS.includes(opts.credentialBackend)) {
38
- log_1.log.error(`invalid --credential-backend "${opts.credentialBackend}" (expected ${CREDENTIAL_BACKENDS.join('|')})`);
39
- process.exitCode = 1;
40
- return;
41
- }
42
- const allowEncryptedFallback = opts.credentialBackend === 'encrypted-file';
43
- const backend = (0, credentialStore_1.selectCredentialBackend)({
44
- allowEncryptedFallback,
45
- passphraseProvider: allowEncryptedFallback
46
- ? () => (0, prompt_1.promptHiddenSync)('Encryption passphrase (for the local credential vault): ')
47
- : undefined,
48
- });
49
- const client = new consoleClient_1.ConsoleClient(env.apiOrigin);
50
- const result = await (0, browserAuth_1.login)({
51
- client,
52
- backend,
53
- env,
54
- openBrowser: browserAuth_1.defaultOpenBrowser,
55
- promptCode: () => (0, prompt_1.promptLineSync)('Paste the authorization code from your browser: '),
56
- cliVersion: pkg.version,
57
- });
58
- if (!result.ok) {
59
- log_1.log.error(result.message ?? 'login failed');
60
- process.exitCode = 1;
61
- return;
62
- }
63
- log_1.log.info(`logged in as ${result.account?.email} [${result.account?.accountKey}] (${env.label})`);
64
- }
65
- catch (err) {
66
- log_1.log.error(`login error: ${err.message}`);
67
- process.exitCode = 1;
68
- }
92
+ .action(async (opts, cmd) => {
93
+ const mode = cmd.optsWithGlobals?.()?.output === 'json' ? 'json' : 'human';
94
+ const outcome = await runLogin(opts);
95
+ new resultPrinter_1.ResultPrinter(mode).emit(outcome);
69
96
  });
70
97
  }
71
98
  //# sourceMappingURL=login.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":";;AAyCA,4BA8DC;AAED,oDAaC;AArHD,wDAAqD;AACrD,qDAAkH;AAClH,yDAA4D;AAC5D,8DAAsH;AACtH,2DAA8F;AAC9F,2CAAyG;AAEzG,0EAA0E;AAC1E,8DAA8D;AAC9D,MAAM,GAAG,GAAG,OAAO,CAAC,oBAAoB,CAAwB,CAAC;AAEjE,gDAAgD;AAChD,MAAM,mBAAmB,GAAsB,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;AAgBhF,MAAM,mBAAmB,GAAiB;IACxC,YAAY,EAAZ,mBAAY;IACZ,aAAa,EAAE,yCAAuB;IACtC,YAAY,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,6BAAa,CAAC,SAAS,CAAC;IACzD,gBAAgB,EAAhB,yBAAgB;CACjB,CAAC;AAEF;;;;GAIG;AACI,KAAK,UAAU,QAAQ,CAAC,IAAkB,EAAE,OAA8B,EAAE;IACjF,MAAM,CAAC,GAAG,EAAE,GAAG,mBAAmB,EAAE,GAAG,IAAI,EAAE,CAAC;IAE9C,IAAI,CAAC,CAAC,gBAAgB,EAAE,EAAE,CAAC;QACzB,OAAO;YACL,EAAE,EAAE,KAAK;YACT,IAAI,EAAE,aAAa;YACnB,OAAO,EACL,+GAA+G;gBAC/G,2FAA2F;SAC9F,CAAC;IACJ,CAAC;IAED,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAA,iCAAkB,EAAC;YAC7B,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;QAEH,gEAAgE;QAChE,sDAAsD;QACtD,IAAI,IAAI,CAAC,iBAAiB,KAAK,SAAS,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC;YAClG,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,iCAAiC,IAAI,CAAC,iBAAiB,eAAe,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG;aAChH,CAAC;QACJ,CAAC;QAED,MAAM,sBAAsB,GAAG,IAAI,CAAC,iBAAiB,KAAK,gBAAgB,CAAC;QAC3E,MAAM,OAAO,GAAG,CAAC,CAAC,aAAa,CAAC;YAC9B,sBAAsB;YACtB,kBAAkB,EAAE,sBAAsB;gBACxC,CAAC,CAAC,GAAG,EAAE,CAAC,IAAA,yBAAgB,EAAC,0DAA0D,CAAC;gBACpF,CAAC,CAAC,SAAS;SACd,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC7C,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,YAAY,CAAC;YAClC,MAAM;YACN,OAAO;YACP,GAAG;YACH,WAAW,EAAE,gCAAkB;YAC/B,UAAU,EAAE,GAAG,EAAE,CAAC,IAAA,uBAAc,EAAC,kDAAkD,CAAC;YACpF,UAAU,EAAE,GAAG,CAAC,OAAO;SACxB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACf,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,cAAc,EAAE,CAAC;QAC1F,CAAC;QACD,OAAO;YACL,EAAE,EAAE,IAAI;YACR,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC,OAAO,EAAE,KAAK,EAAE;YAC9F,YAAY,EAAE,gBAAgB,MAAM,CAAC,OAAO,EAAE,UAAU,KAAK,GAAG,CAAC,KAAK,GAAG;SAC1E,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,YAAY,4BAAmB,EAAE,CAAC;YACvC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC;QAClE,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,gBAAiB,GAAa,CAAC,OAAO,EAAE,EAAE,CAAC;IAClG,CAAC;AACH,CAAC;AAED,SAAgB,oBAAoB,CAAC,OAAgB;IACnD,OAAO;SACJ,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,gEAAgE,CAAC;SAC7E,MAAM,CAAC,sBAAsB,EAAE,8CAA8C,CAAC;SAC9E,MAAM,CAAC,oBAAoB,EAAE,0DAA0D,CAAC;SACxF,MAAM,CAAC,oBAAoB,EAAE,mEAAmE,CAAC;SACjG,MAAM,CAAC,gCAAgC,EAAE,wCAAwC,CAAC;SAClF,MAAM,CAAC,KAAK,EAAE,IAAkB,EAAE,GAAY,EAAE,EAAE;QACjD,MAAM,IAAI,GAAgB,GAAG,CAAC,eAAe,EAAE,EAA0B,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;QAChH,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,6BAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;AACP,CAAC"}
@@ -5,20 +5,20 @@ exports.registerLogoutCommand = registerLogoutCommand;
5
5
  const consoleClient_1 = require("../api/consoleClient");
6
6
  const accountStore_1 = require("../store/accountStore");
7
7
  const credentialStore_1 = require("../store/credentialStore");
8
- const log_1 = require("../util/log");
8
+ const resultPrinter_1 = require("../output/resultPrinter");
9
9
  const prompt_1 = require("../util/prompt");
10
+ const log_1 = require("../util/log");
10
11
  const defaultDeps = {
11
12
  resolveBackend: (account) => (0, credentialStore_1.backendForAccount)(account.backend, {
12
13
  passphraseProvider: account.backend === 'encrypted-file'
13
- ? () => (0, prompt_1.promptHiddenSync)(`Encryption passphrase for ${account.email}: `)
14
+ ? () => (0, prompt_1.promptHiddenSync)(`Encryption passphrase for ${account.email ?? account.accountKey}: `)
14
15
  : undefined,
15
16
  }),
16
17
  createClient: (apiOrigin) => new consoleClient_1.ConsoleClient(apiOrigin),
17
18
  };
18
19
  function resolveTarget(selector) {
19
- if (!selector) {
20
+ if (!selector)
20
21
  return (0, accountStore_1.getCurrentAccount)();
21
- }
22
22
  const resolution = (0, accountStore_1.resolveSelector)((0, accountStore_1.listAccounts)(), selector);
23
23
  if (resolution.kind === 'found')
24
24
  return resolution.account;
@@ -27,73 +27,68 @@ function resolveTarget(selector) {
27
27
  return 'not_found';
28
28
  }
29
29
  /**
30
- * Core logout logic, decoupled from commander so it can be exercised directly
31
- * in unit tests without shelling out to a real OS keyring or hitting a real
32
- * network — registerLogoutCommand() below is a thin CLI-wiring wrapper around
33
- * this with production defaults.
30
+ * Core logout (D-5 self-revoke). Remote self-revoke runs BEFORE local removal;
31
+ * a failed remote revoke preserves local state. `--local-only` skips remote.
34
32
  */
35
33
  async function runLogout(selector, opts, deps = defaultDeps) {
36
34
  const target = resolveTarget(selector);
37
35
  if (target === 'ambiguous') {
38
- return { ok: false, message: `"${selector}" matches more than one saved account — use an account key to disambiguate` };
36
+ return { ok: false, kind: 'business_error', message: `"${selector}" matches more than one saved account — use an account key to disambiguate` };
39
37
  }
40
38
  if (target === 'not_found' || target === null) {
41
39
  return {
42
40
  ok: false,
41
+ kind: 'business_error',
43
42
  message: selector ? `no saved account matches "${selector}"` : 'no current account and no selector given',
44
43
  };
45
44
  }
46
45
  const account = target;
47
46
  if (opts.localOnly) {
48
47
  try {
49
- const backend = deps.resolveBackend(account);
50
48
  // delete() never needs the passphrase — see encryptedFile.ts.
51
- backend.delete(account.accountKey);
49
+ deps.resolveBackend(account).delete(account.accountKey);
52
50
  }
53
51
  catch (err) {
54
52
  log_1.log.warn('local credential cleanup failed (continuing)', { error: err.message });
55
53
  }
56
54
  (0, accountStore_1.removeAccount)(account.accountKey);
57
- return { ok: true, message: `removed local state for ${account.accountKey} (remote not contacted, --local-only)` };
55
+ return { ok: true, result: { removed: account.accountKey, remoteRevoked: false }, humanMessage: `removed local state for ${account.accountKey} (remote not contacted, --local-only)` };
58
56
  }
59
57
  let backend;
60
58
  try {
61
59
  backend = deps.resolveBackend(account);
62
60
  }
63
61
  catch (err) {
64
- return { ok: false, message: `cannot access the credential store to revoke remotely: ${err.message}` };
62
+ return { ok: false, kind: 'infra_error', message: `cannot access the credential store to revoke remotely: ${err.message}` };
65
63
  }
66
64
  const secret = backend.get(account.accountKey);
67
65
  if (!secret) {
68
66
  // Nothing live to revoke remotely from this machine's perspective.
69
67
  (0, accountStore_1.removeAccount)(account.accountKey);
70
- return { ok: true, message: `removed local state for ${account.accountKey} (no credential on file)` };
68
+ return { ok: true, result: { removed: account.accountKey, remoteRevoked: false }, humanMessage: `removed local state for ${account.accountKey} (no credential on file)` };
71
69
  }
72
70
  const client = deps.createClient(account.apiOrigin);
73
- const outcome = await client.logout({ refresh_token: secret.refreshToken, access_token: secret.accessToken });
71
+ const outcome = await client.revokeSelfToken(secret.token);
74
72
  if (outcome.kind !== 'success') {
73
+ const kind = outcome.kind === 'rate_limited' ? 'rate_limited' : outcome.kind === 'auth_invalid' ? 'auth_invalid' : 'infra_error';
75
74
  return {
76
75
  ok: false,
76
+ kind,
77
77
  message: `remote revoke failed (${outcome.kind}) — local account state preserved; retry, or pass --local-only to force removal`,
78
78
  };
79
79
  }
80
80
  backend.delete(account.accountKey);
81
81
  (0, accountStore_1.removeAccount)(account.accountKey);
82
- return { ok: true, message: `logged out ${account.accountKey}` };
82
+ return { ok: true, result: { removed: account.accountKey, remoteRevoked: true }, humanMessage: `logged out ${account.accountKey}` };
83
83
  }
84
84
  function registerLogoutCommand(program) {
85
85
  program
86
86
  .command('logout [selector]')
87
- .description('Log out of an account (defaults to current). Remote revoke runs before local removal.')
87
+ .description('Log out of an account (defaults to current). Remote self-revoke runs before local removal.')
88
88
  .option('--local-only', 'skip the remote revoke call and only remove local state')
89
- .action(async (selector, opts) => {
90
- const result = await runLogout(selector, opts);
91
- if (!result.ok) {
92
- log_1.log.error(result.message ?? 'logout failed');
93
- process.exitCode = 1;
94
- return;
95
- }
96
- log_1.log.info(result.message ?? 'logged out');
89
+ .action(async (selector, opts, cmd) => {
90
+ const mode = cmd.optsWithGlobals?.()?.output === 'json' ? 'json' : 'human';
91
+ new resultPrinter_1.ResultPrinter(mode).emit(await runLogout(selector, opts));
97
92
  });
98
93
  }
99
94
  //# sourceMappingURL=logout.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"logout.js","sourceRoot":"","sources":["../../src/commands/logout.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"logout.js","sourceRoot":"","sources":["../../src/commands/logout.ts"],"names":[],"mappings":"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"}