@supersdk/supercli 0.3.2 → 0.3.3-staging.47
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/dist/build/artifactIntegrity.js +275 -0
- package/dist/build/artifactIntegrity.js.map +1 -0
- package/dist/build/projectBuild.js +335 -0
- package/dist/build/projectBuild.js.map +1 -0
- package/dist/cli.js +20 -11
- package/dist/cli.js.map +1 -1
- package/dist/commands/add.js +111 -57
- package/dist/commands/add.js.map +1 -1
- package/dist/commands/analytics.js +15 -9
- package/dist/commands/analytics.js.map +1 -1
- package/dist/commands/build.js +533 -0
- package/dist/commands/build.js.map +1 -0
- package/dist/commands/db.js +24 -19
- package/dist/commands/db.js.map +1 -1
- package/dist/commands/deploy.js +434 -751
- package/dist/commands/deploy.js.map +1 -1
- package/dist/commands/env.js +8 -8
- package/dist/commands/env.js.map +1 -1
- package/dist/commands/image.js +31 -20
- package/dist/commands/image.js.map +1 -1
- package/dist/commands/init.js +81 -57
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/logs.js +16 -7
- package/dist/commands/logs.js.map +1 -1
- package/dist/commands/publishSite.js +28 -943
- package/dist/commands/publishSite.js.map +1 -1
- package/dist/commands/register.js +84 -218
- package/dist/commands/register.js.map +1 -1
- package/dist/commands/settings.js +10 -6
- package/dist/commands/settings.js.map +1 -1
- package/dist/config/appConfig.js +48 -171
- package/dist/config/appConfig.js.map +1 -1
- package/dist/config/superConfig.js +457 -0
- package/dist/config/superConfig.js.map +1 -0
- package/dist/deploy/adapterTypes.js +3 -0
- package/dist/deploy/adapterTypes.js.map +1 -0
- package/dist/deploy/manifest.js +403 -0
- package/dist/deploy/manifest.js.map +1 -0
- package/dist/deploy/preflight.js +201 -0
- package/dist/deploy/preflight.js.map +1 -0
- package/dist/deploy/resultWriter.js +178 -0
- package/dist/deploy/resultWriter.js.map +1 -0
- package/dist/deploy/runAdapter.js +302 -0
- package/dist/deploy/runAdapter.js.map +1 -0
- package/dist/deploy/siteAdapter.js +182 -0
- package/dist/deploy/siteAdapter.js.map +1 -0
- package/dist/docker/dockerCli.js +110 -53
- package/dist/docker/dockerCli.js.map +1 -1
- package/dist/output/envelope.js +5 -1
- package/dist/output/envelope.js.map +1 -1
- package/dist/output/resultPrinter.js +3 -0
- package/dist/output/resultPrinter.js.map +1 -1
- package/dist/publish/responseClassifier.js +4 -4
- package/dist/publish/responseClassifier.js.map +1 -1
- package/dist/publish/runClient.js +11 -11
- package/dist/publish/runClient.js.map +1 -1
- package/dist/publish/siteZip.js +4 -5
- package/dist/publish/siteZip.js.map +1 -1
- package/dist/template/README.md +26 -257
- package/dist/template/android/app/src/main/java/com/supersdk/simple/EnvironmentStore.java +1 -1
- package/dist/template/android/app/src/main/java/com/supersdk/simple/SimpleApplication.java +2 -2
- package/dist/template/android/gradle/supersdk-config-reader.gradle +13 -61
- package/dist/template/android/scripts/build.sh +11 -0
- package/dist/template/android/supersdk-default.config.json +3 -2
- package/dist/template/ios/Sources/App/AppDelegate.swift +1 -1
- package/dist/template/ios/Sources/App/SimpleSDKBootstrap.swift +1 -1
- package/dist/template/ios/project.yml +1 -1
- package/dist/template/ios/scripts/build.sh +19 -0
- package/dist/template/ios/scripts/render_project.py +60 -0
- package/dist/template/ios/supersdk-default.config.json +6 -0
- package/dist/template/service/Dockerfile +2 -0
- package/dist/template/service/scripts/build.sh +11 -0
- package/dist/template/super.json +62 -0
- package/dist/template/template_manifest.json +6 -9
- package/dist/template/web/package.json +8 -0
- package/dist/template/web/scripts/build.sh +8 -0
- package/dist/template/web/scripts/web_package.py +490 -0
- package/dist/template/web/src/js/app.js +2 -2
- package/dist/util/shell.js +3 -3
- package/dist/workspace/config.js +69 -183
- package/dist/workspace/config.js.map +1 -1
- package/dist/workspace/identity.js +10 -18
- package/dist/workspace/identity.js.map +1 -1
- package/dist/workspace/projectContext.js +93 -0
- package/dist/workspace/projectContext.js.map +1 -0
- package/dist/workspace/projectIdentity.js +50 -98
- package/dist/workspace/projectIdentity.js.map +1 -1
- package/dist/workspace/template.js +208 -83
- package/dist/workspace/template.js.map +1 -1
- package/package.json +4 -2
- package/dist/publish/siteConfig.js +0 -649
- package/dist/publish/siteConfig.js.map +0 -1
- package/dist/template/scripts/android_snapshot_canary.py +0 -145
- package/dist/template/scripts/build_android.sh +0 -366
- package/dist/template/scripts/build_ios.sh +0 -299
- package/dist/template/scripts/build_site.sh +0 -43
- package/dist/template/scripts/lib/workspace.sh +0 -43
- package/dist/template/scripts/serve_web.py +0 -80
- package/dist/template/scripts/super_build_orchestrator.py +0 -421
- package/dist/template/scripts/supersdk_template.py +0 -1161
- package/dist/template/scripts/web_host_validator.py +0 -103
- package/dist/template/scripts/web_package.py +0 -295
- package/dist/template/scripts/ws03_shared_schema_merge_guard.py +0 -73
- package/dist/template/super_build.sh +0 -144
- package/dist/template/supersdk.json +0 -35
- package/dist/workspace/inspect.js +0 -274
- package/dist/workspace/inspect.js.map +0 -1
package/dist/commands/init.js
CHANGED
|
@@ -38,10 +38,11 @@ exports.registerInitCommand = registerInitCommand;
|
|
|
38
38
|
const fs = __importStar(require("node:fs"));
|
|
39
39
|
const path = __importStar(require("node:path"));
|
|
40
40
|
const appConfig_1 = require("../config/appConfig");
|
|
41
|
-
const
|
|
41
|
+
const resultPrinter_1 = require("../output/resultPrinter");
|
|
42
42
|
const prompt_1 = require("../util/prompt");
|
|
43
43
|
const shell_1 = require("../util/shell");
|
|
44
44
|
const config_1 = require("../workspace/config");
|
|
45
|
+
const superConfig_1 = require("../config/superConfig");
|
|
45
46
|
const identity_1 = require("../workspace/identity");
|
|
46
47
|
const interactive_1 = require("../workspace/interactive");
|
|
47
48
|
const template_1 = require("../workspace/template");
|
|
@@ -53,16 +54,17 @@ const template_1 = require("../workspace/template");
|
|
|
53
54
|
*/
|
|
54
55
|
function addPlaceholderCommand(dirArg) {
|
|
55
56
|
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
|
+
return `supercli add ${(0, shell_1.shellQuote)(`<${template_1.PROJECT_TYPE_NAMES.join('|')}>`)} ${dir} --project ${(0, shell_1.shellQuote)('<project-id>')} ...`;
|
|
57
58
|
}
|
|
58
|
-
function suggestedCommand(target,
|
|
59
|
+
function suggestedCommand(target, configPath, name) {
|
|
59
60
|
const parts = ['supercli init', (0, shell_1.shellQuote)(target)];
|
|
60
|
-
|
|
61
|
+
if (configPath !== path.join(target, config_1.CONFIG_FILENAME))
|
|
62
|
+
parts.push('--config', (0, shell_1.shellQuote)(configPath));
|
|
61
63
|
if (name)
|
|
62
64
|
parts.push('--name', (0, shell_1.shellQuote)(name));
|
|
63
65
|
return parts.join(' ');
|
|
64
66
|
}
|
|
65
|
-
function failureMessage(target, interactive, resolution,
|
|
67
|
+
function failureMessage(target, configPath, interactive, resolution, resolvedName) {
|
|
66
68
|
const lines = [];
|
|
67
69
|
if (resolution.errors.length > 0) {
|
|
68
70
|
lines.push('invalid init arguments:');
|
|
@@ -72,17 +74,19 @@ function failureMessage(target, interactive, resolution, resolvedSpid, resolvedN
|
|
|
72
74
|
if (resolution.missingFlags.length > 0) {
|
|
73
75
|
lines.push((0, interactive_1.missingFlagsHeadline)('supercli init', interactive, resolution.missingFlags));
|
|
74
76
|
}
|
|
75
|
-
lines.push('', 'Re-run with the values spelled out:', '', ` ${suggestedCommand(target,
|
|
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
|
+
lines.push('', 'Re-run with the values spelled out:', '', ` ${suggestedCommand(target, configPath, resolvedName)}`, '', 'The SPID is collected once by the interactive bootstrap prompt and is never accepted as a command flag.', ' --name <name> optional workspace description; defaults to the target directory name. ' +
|
|
77
78
|
'It is a description only and is NEVER used as an App label — android/ios projects carry their own --name.');
|
|
78
79
|
return lines.join('\n');
|
|
79
80
|
}
|
|
80
|
-
function summary(target, spid, name, created, kept, missingInTemplate) {
|
|
81
|
+
function summary(target, configPath, spid, name, created, kept, missingInTemplate) {
|
|
82
|
+
const configOption = configPath === path.join(target, config_1.CONFIG_FILENAME)
|
|
83
|
+
? ''
|
|
84
|
+
: ` --config ${(0, shell_1.shellQuote)(configPath)}`;
|
|
81
85
|
const lines = [
|
|
82
86
|
`initialized workspace at ${target}`,
|
|
83
87
|
`spid: ${spid}`,
|
|
84
88
|
`name: ${name ?? '(unset)'}`,
|
|
85
|
-
`config: ${
|
|
89
|
+
`config: ${configPath} (schemaVersion ${appConfig_1.APP_CONFIG_SCHEMA_VERSION}, projects: [])`,
|
|
86
90
|
`shared: ${created.length > 0 ? created.join(', ') : '(none written)'}`,
|
|
87
91
|
];
|
|
88
92
|
// 「已存在所以跳过」必须说出来:静默跳过会让人以为拿到的是模板里的那一份。
|
|
@@ -90,7 +94,7 @@ function summary(target, spid, name, created, kept, missingInTemplate) {
|
|
|
90
94
|
lines.push(`kept (already present, not overwritten): ${kept.join(', ')}`);
|
|
91
95
|
if (missingInTemplate.length > 0)
|
|
92
96
|
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)}`,
|
|
97
|
+
lines.push('', 'next — register a project directory for each platform you need:', ` cd ${(0, shell_1.shellQuote)(target)}`, ` supercli add android apps/android --project android-app --package com.acme.myapp --name 'My App'${configOption}`, ` supercli add ios apps/ios --project ios-app --bundle-id com.acme.myapp --name 'My App'${configOption}`, ` supercli add site apps/web --project web --env-target prod --slug myapp --env prod${configOption}`, '', `project types: ${template_1.PROJECT_TYPE_NAMES.join(' | ')}`);
|
|
94
98
|
return lines.join('\n');
|
|
95
99
|
}
|
|
96
100
|
/**
|
|
@@ -98,24 +102,55 @@ function summary(target, spid, name, created, kept, missingInTemplate) {
|
|
|
98
102
|
* exercised directly in unit/integration tests against a fixture template.
|
|
99
103
|
*/
|
|
100
104
|
async function runInit(dirArg, opts, deps = {}) {
|
|
101
|
-
const
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
105
|
+
const configPath = opts.config !== undefined ? path.resolve(opts.config) : path.join(path.resolve(dirArg ?? '.'), config_1.CONFIG_FILENAME);
|
|
106
|
+
let selectedConfigPath = configPath;
|
|
107
|
+
let discovered;
|
|
108
|
+
if (opts.config === undefined && dirArg === undefined) {
|
|
109
|
+
discovered = (0, superConfig_1.findSuperConfig)(process.cwd());
|
|
110
|
+
if (discovered.kind === 'valid')
|
|
111
|
+
selectedConfigPath = discovered.config.path;
|
|
112
|
+
else if (discovered.kind === 'invalid' || discovered.kind === 'ambiguous') {
|
|
113
|
+
return { ok: false, message: (0, config_1.describeConfigProblem)(discovered, process.cwd()) ?? 'configuration is invalid' };
|
|
114
|
+
}
|
|
107
115
|
}
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
+
const target = path.dirname(selectedConfigPath);
|
|
117
|
+
// Existing v5 config is an idempotent init: validate it through the normal
|
|
118
|
+
// resolver and install only missing non-build workspace files. No bootstrap prompt is
|
|
119
|
+
// ever reached on this path.
|
|
120
|
+
const existing = discovered?.kind === 'valid'
|
|
121
|
+
? discovered
|
|
122
|
+
: fs.existsSync(selectedConfigPath) ? (0, superConfig_1.findSuperConfig)(target, selectedConfigPath) : undefined;
|
|
123
|
+
if (existing?.kind === 'valid') {
|
|
124
|
+
let templateRoot;
|
|
125
|
+
try {
|
|
126
|
+
templateRoot = deps.templateRoot ?? (0, template_1.locateDefaultTemplateRoot)();
|
|
127
|
+
}
|
|
128
|
+
catch (err) {
|
|
129
|
+
return { ok: false, message: err.message };
|
|
130
|
+
}
|
|
131
|
+
try {
|
|
132
|
+
const { manifest } = (0, template_1.loadTemplateManifest)(templateRoot);
|
|
133
|
+
const shared = (0, template_1.ensureWorkspaceShared)(existing.config.root, templateRoot, manifest);
|
|
134
|
+
return {
|
|
135
|
+
ok: true,
|
|
136
|
+
message: summary(existing.config.root, existing.config.path, existing.config.spid, existing.config.name, shared.created, shared.kept, shared.missingInTemplate),
|
|
137
|
+
root: existing.config.root,
|
|
138
|
+
configPath: existing.config.path,
|
|
139
|
+
spid: existing.config.spid,
|
|
140
|
+
...(existing.config.name !== undefined ? { name: existing.config.name } : {}),
|
|
141
|
+
sharedCreated: shared.created,
|
|
142
|
+
sharedKept: shared.kept,
|
|
143
|
+
};
|
|
144
|
+
}
|
|
145
|
+
catch (err) {
|
|
146
|
+
return { ok: false, message: `failed to write the workspace shared files: ${err.message}` };
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
if (existing?.kind === 'invalid' || existing?.kind === 'ambiguous') {
|
|
150
|
+
return { ok: false, message: (0, config_1.describeConfigProblem)(existing, target) ?? 'configuration is invalid' };
|
|
116
151
|
}
|
|
117
|
-
// 🔴
|
|
118
|
-
//
|
|
152
|
+
// 🔴 嵌套工作空间必须硬失败,不能只是「不覆盖就算了」。否则内层的 super.json 会
|
|
153
|
+
// **遮蔽**外层:此后每一次 add / build / deploy 都可能绑到内层那个
|
|
119
154
|
// spid 上,两份配置各自漂移、共享物各存一份,全程零告警。add 早就把「项目目录不得互为祖先」
|
|
120
155
|
// 当硬失败,init 不查就是在同一棵树上给了两套判据。
|
|
121
156
|
const enclosing = (0, config_1.findEnclosingWorkspace)(target);
|
|
@@ -125,7 +160,7 @@ async function runInit(dirArg, opts, deps = {}) {
|
|
|
125
160
|
return {
|
|
126
161
|
ok: false,
|
|
127
162
|
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 `
|
|
163
|
+
'contain another one: the inner config shadows the outer for every `supercli add`, `build` and `deploy` ' +
|
|
129
164
|
'run below it, so the two spids drift apart without a single warning.\n' +
|
|
130
165
|
`Register this directory as a project of the workspace that already owns it:\n\n` +
|
|
131
166
|
` cd ${(0, shell_1.shellQuote)(enclosingRoot)}\n` +
|
|
@@ -149,7 +184,7 @@ async function runInit(dirArg, opts, deps = {}) {
|
|
|
149
184
|
const prompt = deps.prompt ?? prompt_1.promptLineWithDefaultSync;
|
|
150
185
|
const resolution = (0, interactive_1.newResolution)();
|
|
151
186
|
const spid = (0, interactive_1.resolveValue)(resolution, interactive, prompt, {
|
|
152
|
-
flag: '
|
|
187
|
+
flag: 'interactive SPID prompt',
|
|
153
188
|
question: 'Project spid (8 characters, issued by Console)',
|
|
154
189
|
provided: (0, interactive_1.trimFlag)(opts.spid),
|
|
155
190
|
check: identity_1.checkSpid,
|
|
@@ -165,50 +200,37 @@ async function runInit(dirArg, opts, deps = {}) {
|
|
|
165
200
|
askWhenOptional: true,
|
|
166
201
|
});
|
|
167
202
|
if (resolution.errors.length > 0 || resolution.missingFlags.length > 0 || spid === undefined) {
|
|
168
|
-
return { ok: false, message: failureMessage(target, interactive, resolution,
|
|
203
|
+
return { ok: false, message: failureMessage(target, configPath, interactive, resolution, name) };
|
|
169
204
|
}
|
|
170
205
|
// 共享物先落地:它是**幂等且绝不覆盖**的,即使随后写配置失败,重跑 init 也不会丢东西。
|
|
171
206
|
// 反过来(先写配置)失败时,下一次 init 会被「already a workspace」挡住,人就卡住了。
|
|
172
207
|
let shared;
|
|
173
208
|
try {
|
|
174
209
|
const { manifest } = (0, template_1.loadTemplateManifest)(templateRoot);
|
|
210
|
+
(0, template_1.assertNoSymlinkPath)(target);
|
|
175
211
|
fs.mkdirSync(target, { recursive: true });
|
|
176
212
|
shared = (0, template_1.ensureWorkspaceShared)(target, templateRoot, manifest);
|
|
177
213
|
}
|
|
178
214
|
catch (err) {
|
|
179
215
|
return { ok: false, message: `failed to write the workspace shared files: ${err.message}` };
|
|
180
216
|
}
|
|
181
|
-
const templateDefaults = (0, template_1.readTemplateDefaults)(templateRoot);
|
|
182
217
|
const document = {
|
|
183
218
|
schemaVersion: appConfig_1.APP_CONFIG_SCHEMA_VERSION,
|
|
184
219
|
spid,
|
|
185
220
|
...(name !== undefined ? { name } : {}),
|
|
186
|
-
// version / sdk 是 workspace 级**默认**(项目级可整值覆盖)。取自模板而不是硬编码:
|
|
187
|
-
// sdk.androidVersion 会随 SDK 发版变化,写死一份必然腐烂。
|
|
188
|
-
...(templateDefaults.version ? { version: templateDefaults.version } : {}),
|
|
189
|
-
...(templateDefaults.sdk ? { sdk: templateDefaults.sdk } : {}),
|
|
190
221
|
projects: [],
|
|
191
222
|
};
|
|
192
223
|
try {
|
|
193
|
-
(0, config_1.createWorkspaceConfig)(
|
|
224
|
+
(0, config_1.createWorkspaceConfig)(selectedConfigPath, document);
|
|
194
225
|
}
|
|
195
226
|
catch (err) {
|
|
196
|
-
return { ok: false, message: `failed to write ${
|
|
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)`);
|
|
227
|
+
return { ok: false, message: `failed to write ${selectedConfigPath}: ${err.message}` };
|
|
206
228
|
}
|
|
207
229
|
return {
|
|
208
230
|
ok: true,
|
|
209
|
-
message: summary(target, spid, name, shared.created, shared.kept, shared.missingInTemplate),
|
|
231
|
+
message: summary(target, selectedConfigPath, spid, name, shared.created, shared.kept, shared.missingInTemplate),
|
|
210
232
|
root: target,
|
|
211
|
-
configPath,
|
|
233
|
+
configPath: selectedConfigPath,
|
|
212
234
|
spid,
|
|
213
235
|
...(name !== undefined ? { name } : {}),
|
|
214
236
|
sharedCreated: shared.created,
|
|
@@ -218,17 +240,19 @@ async function runInit(dirArg, opts, deps = {}) {
|
|
|
218
240
|
function registerInitCommand(program) {
|
|
219
241
|
program
|
|
220
242
|
.command('init [dir]')
|
|
221
|
-
.description('Create a SuperSDK workspace
|
|
222
|
-
.option('--
|
|
243
|
+
.description('Create a strict schema-v5 SuperSDK workspace in dir (default: .).')
|
|
244
|
+
.option('--config <path>', 'explicit super.json path')
|
|
223
245
|
.option('--name <name>', 'workspace description; defaults to the directory name. Never used as an App label')
|
|
224
|
-
.
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
246
|
+
.option('--output <mode>', 'output mode: "json" emits a single machine-readable envelope on stdout')
|
|
247
|
+
.option('--no-input', 'never prompt for interactive input')
|
|
248
|
+
.action(async (dirArg, opts, command) => {
|
|
249
|
+
const mode = command.optsWithGlobals?.()?.output === 'json' ? 'json' : 'human';
|
|
250
|
+
const result = await runInit(dirArg, opts, { isInteractive: () => opts.input !== false && mode !== 'json' && (0, prompt_1.isInteractiveStdin)() });
|
|
251
|
+
const printer = new resultPrinter_1.ResultPrinter(mode);
|
|
252
|
+
if (!result.ok)
|
|
253
|
+
printer.failure('business_error', result.message);
|
|
254
|
+
else
|
|
255
|
+
printer.success({ configPath: result.configPath, spid: result.spid, ...(result.name ? { name: result.name } : {}) }, { humanMessage: result.message });
|
|
232
256
|
});
|
|
233
257
|
}
|
|
234
258
|
//# sourceMappingURL=init.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/logs.js
CHANGED
|
@@ -10,6 +10,7 @@ const runClient_1 = require("../publish/runClient");
|
|
|
10
10
|
const accountStore_1 = require("../store/accountStore");
|
|
11
11
|
const credentialStore_1 = require("../store/credentialStore");
|
|
12
12
|
const prompt_1 = require("../util/prompt");
|
|
13
|
+
const projectContext_1 = require("../workspace/projectContext");
|
|
13
14
|
function value(raw) { const trimmed = raw?.trim(); return trimmed ? trimmed : null; }
|
|
14
15
|
function storedToken(account) {
|
|
15
16
|
return (0, credentialStore_1.backendForAccount)(account.backend, { passphraseProvider: account.backend === 'encrypted-file' ? () => (0, prompt_1.promptHiddenSync)(`Encryption passphrase for ${account.email ?? account.accountKey}: `) : undefined }).get(account.accountKey)?.token ?? null;
|
|
@@ -47,13 +48,13 @@ function outcomeError(kind, code) {
|
|
|
47
48
|
return { ok: false, kind: 'infra_error', publicCode: code, message: 'logs service is unavailable or returned an invalid response — retry later' };
|
|
48
49
|
}
|
|
49
50
|
async function runLogs(service, opts, mode) {
|
|
50
|
-
const
|
|
51
|
+
const configContext = (0, projectContext_1.resolveWorkspaceContext)(process.cwd(), opts.config);
|
|
52
|
+
if ('ok' in configContext)
|
|
53
|
+
return configContext;
|
|
51
54
|
const env = value(opts.env);
|
|
52
|
-
if (!/^[a-z0-9]{8}$/.test(spid ?? ''))
|
|
53
|
-
return { ok: false, kind: 'usage_error', message: '--spid is required and must be 8 lowercase letters or digits' };
|
|
54
55
|
if (!/^[a-z0-9]{1,10}$/.test(env ?? ''))
|
|
55
56
|
return { ok: false, kind: 'usage_error', message: '--env is required and must be 1-10 lowercase letters or digits' };
|
|
56
|
-
const checkedSpid = spid;
|
|
57
|
+
const checkedSpid = configContext.spid;
|
|
57
58
|
const checkedEnv = env;
|
|
58
59
|
if (!/^[a-z0-9]{1,32}$/.test(service) || service === 'stg' || service === 'site')
|
|
59
60
|
return { ok: false, kind: 'usage_error', message: '<service> must be a valid service slug' };
|
|
@@ -77,7 +78,11 @@ async function runLogs(service, opts, mode) {
|
|
|
77
78
|
const result = query.kind === 'success' ? query.data : query.resource;
|
|
78
79
|
const humanLines = result.records.map((record) => `${record.event_time} ${record.severity.padEnd(7)} ${record.revision ?? '—'} · ${record.pod_name} · ${record.stream} ${record.message}`);
|
|
79
80
|
if (!opts.follow)
|
|
80
|
-
return {
|
|
81
|
+
return {
|
|
82
|
+
ok: true,
|
|
83
|
+
result: (0, projectContext_1.withConfigIdentity)(configContext, result),
|
|
84
|
+
humanMessage: (0, projectContext_1.withConfigIdentityMessage)(configContext, humanLines.join('\n') || 'No logs matched the last 15 minutes.'),
|
|
85
|
+
};
|
|
81
86
|
// Human output is chronological: retained history first, then live records.
|
|
82
87
|
// JSON mode deliberately withholds both until ResultPrinter emits its one envelope.
|
|
83
88
|
if (mode === 'human')
|
|
@@ -114,12 +119,16 @@ async function runLogs(service, opts, mode) {
|
|
|
114
119
|
if (followed.kind !== 'success' && followed.kind !== 'soft_success')
|
|
115
120
|
return outcomeError(followed.kind, 'code' in followed ? followed.code : undefined);
|
|
116
121
|
// Do not accumulate a 30-minute stream in memory or place it in the JSON envelope.
|
|
117
|
-
return {
|
|
122
|
+
return {
|
|
123
|
+
ok: true,
|
|
124
|
+
result: (0, projectContext_1.withConfigIdentity)(configContext, { ...result, follow: { frames_seen: followFramesSeen, last_watermark: lastWatermark } }),
|
|
125
|
+
humanMessage: (0, projectContext_1.withConfigIdentityMessage)(configContext, `Follow session ended after ${followFramesSeen} frame(s).`),
|
|
126
|
+
};
|
|
118
127
|
}
|
|
119
128
|
function registerLogsCommand(program) {
|
|
120
129
|
program.command('logs <service>')
|
|
121
130
|
.description('Query r7 service logs; --follow continues from the exclusive watermark.')
|
|
122
|
-
.
|
|
131
|
+
.option('--config <path>', 'explicit super.json path')
|
|
123
132
|
.requiredOption('--env <env>', 'project environment')
|
|
124
133
|
.option('--org <id>', 'organization id; defaults to the org bound to the current token')
|
|
125
134
|
.option('--follow', 'continue with the real-time stream after the history query')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logs.js","sourceRoot":"","sources":["../../src/commands/logs.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"logs.js","sourceRoot":"","sources":["../../src/commands/logs.ts"],"names":[],"mappings":"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"}
|