@supersdk/supercli 0.3.2-staging.44 → 0.3.2
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/cli.js +11 -22
- package/dist/cli.js.map +1 -1
- package/dist/commands/add.js +31 -79
- package/dist/commands/add.js.map +1 -1
- package/dist/commands/analytics.js +9 -15
- package/dist/commands/analytics.js.map +1 -1
- package/dist/commands/db.js +19 -24
- package/dist/commands/db.js.map +1 -1
- package/dist/commands/deploy.js +751 -434
- 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 +20 -31
- package/dist/commands/image.js.map +1 -1
- package/dist/commands/init.js +37 -68
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/logs.js +7 -16
- package/dist/commands/logs.js.map +1 -1
- package/dist/commands/publishSite.js +943 -28
- package/dist/commands/publishSite.js.map +1 -1
- package/dist/commands/register.js +30 -51
- package/dist/commands/register.js.map +1 -1
- package/dist/commands/settings.js +6 -10
- package/dist/commands/settings.js.map +1 -1
- package/dist/config/appConfig.js +36 -40
- package/dist/config/appConfig.js.map +1 -1
- package/dist/docker/dockerCli.js +1 -63
- package/dist/docker/dockerCli.js.map +1 -1
- package/dist/output/envelope.js +1 -5
- package/dist/output/envelope.js.map +1 -1
- package/dist/output/resultPrinter.js +0 -3
- 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/siteConfig.js +649 -0
- package/dist/publish/siteConfig.js.map +1 -0
- package/dist/publish/siteZip.js +5 -4
- package/dist/publish/siteZip.js.map +1 -1
- package/dist/template/README.md +227 -64
- 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 +5 -6
- package/dist/template/android/supersdk-default.config.json +2 -3
- package/dist/template/ios/Sources/App/AppDelegate.swift +1 -1
- package/dist/template/ios/Sources/App/SimpleSDKBootstrap.swift +1 -1
- package/dist/template/scripts/build_android.sh +10 -26
- package/dist/template/scripts/build_ios.sh +9 -41
- package/dist/template/scripts/build_site.sh +26 -40
- package/dist/template/scripts/lib/workspace.sh +4 -4
- package/dist/template/scripts/serve_web.py +4 -2
- package/dist/template/scripts/super_build_orchestrator.py +355 -278
- package/dist/template/scripts/supersdk_template.py +181 -414
- package/dist/template/scripts/web_package.py +8 -9
- package/dist/template/super_build.sh +113 -39
- package/dist/template/{super.json → supersdk.json} +1 -20
- package/dist/template/template_manifest.json +4 -5
- package/dist/workspace/config.js +119 -81
- package/dist/workspace/config.js.map +1 -1
- package/dist/workspace/identity.js +14 -15
- package/dist/workspace/identity.js.map +1 -1
- package/dist/workspace/inspect.js +0 -1
- package/dist/workspace/inspect.js.map +1 -1
- package/dist/workspace/projectIdentity.js +96 -53
- package/dist/workspace/projectIdentity.js.map +1 -1
- package/dist/workspace/template.js +8 -5
- package/dist/workspace/template.js.map +1 -1
- package/package.json +2 -2
- package/dist/build/artifactIntegrity.js +0 -119
- package/dist/build/artifactIntegrity.js.map +0 -1
- package/dist/commands/build.js +0 -231
- package/dist/commands/build.js.map +0 -1
- package/dist/commands/config.js +0 -170
- package/dist/commands/config.js.map +0 -1
- package/dist/config/superConfig.js +0 -429
- package/dist/config/superConfig.js.map +0 -1
- package/dist/deploy/adapterTypes.js +0 -3
- package/dist/deploy/adapterTypes.js.map +0 -1
- package/dist/deploy/manifest.js +0 -381
- package/dist/deploy/manifest.js.map +0 -1
- package/dist/deploy/preflight.js +0 -202
- package/dist/deploy/preflight.js.map +0 -1
- package/dist/deploy/resultWriter.js +0 -178
- package/dist/deploy/resultWriter.js.map +0 -1
- package/dist/deploy/runAdapter.js +0 -299
- package/dist/deploy/runAdapter.js.map +0 -1
- package/dist/deploy/siteAdapter.js +0 -182
- package/dist/deploy/siteAdapter.js.map +0 -1
- package/dist/template/scripts/build_service.sh +0 -89
- package/dist/template/service/Dockerfile +0 -2
- package/dist/workspace/projectContext.js +0 -93
- package/dist/workspace/projectContext.js.map +0 -1
|
@@ -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,7 +10,6 @@ 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");
|
|
14
13
|
function value(raw) { const trimmed = raw?.trim(); return trimmed ? trimmed : null; }
|
|
15
14
|
function storedToken(account) {
|
|
16
15
|
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;
|
|
@@ -48,13 +47,13 @@ function outcomeError(kind, code) {
|
|
|
48
47
|
return { ok: false, kind: 'infra_error', publicCode: code, message: 'logs service is unavailable or returned an invalid response — retry later' };
|
|
49
48
|
}
|
|
50
49
|
async function runLogs(service, opts, mode) {
|
|
51
|
-
const
|
|
52
|
-
if ('ok' in configContext)
|
|
53
|
-
return configContext;
|
|
50
|
+
const spid = value(opts.spid);
|
|
54
51
|
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' };
|
|
55
54
|
if (!/^[a-z0-9]{1,10}$/.test(env ?? ''))
|
|
56
55
|
return { ok: false, kind: 'usage_error', message: '--env is required and must be 1-10 lowercase letters or digits' };
|
|
57
|
-
const checkedSpid =
|
|
56
|
+
const checkedSpid = spid;
|
|
58
57
|
const checkedEnv = env;
|
|
59
58
|
if (!/^[a-z0-9]{1,32}$/.test(service) || service === 'stg' || service === 'site')
|
|
60
59
|
return { ok: false, kind: 'usage_error', message: '<service> must be a valid service slug' };
|
|
@@ -78,11 +77,7 @@ async function runLogs(service, opts, mode) {
|
|
|
78
77
|
const result = query.kind === 'success' ? query.data : query.resource;
|
|
79
78
|
const humanLines = result.records.map((record) => `${record.event_time} ${record.severity.padEnd(7)} ${record.revision ?? '—'} · ${record.pod_name} · ${record.stream} ${record.message}`);
|
|
80
79
|
if (!opts.follow)
|
|
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
|
-
};
|
|
80
|
+
return { ok: true, result, humanMessage: humanLines.join('\n') || 'No logs matched the last 15 minutes.' };
|
|
86
81
|
// Human output is chronological: retained history first, then live records.
|
|
87
82
|
// JSON mode deliberately withholds both until ResultPrinter emits its one envelope.
|
|
88
83
|
if (mode === 'human')
|
|
@@ -119,16 +114,12 @@ async function runLogs(service, opts, mode) {
|
|
|
119
114
|
if (followed.kind !== 'success' && followed.kind !== 'soft_success')
|
|
120
115
|
return outcomeError(followed.kind, 'code' in followed ? followed.code : undefined);
|
|
121
116
|
// Do not accumulate a 30-minute stream in memory or place it in the JSON envelope.
|
|
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
|
-
};
|
|
117
|
+
return { ok: true, result: { ...result, follow: { frames_seen: followFramesSeen, last_watermark: lastWatermark } }, humanMessage: `Follow session ended after ${followFramesSeen} frame(s).` };
|
|
127
118
|
}
|
|
128
119
|
function registerLogsCommand(program) {
|
|
129
120
|
program.command('logs <service>')
|
|
130
121
|
.description('Query r7 service logs; --follow continues from the exclusive watermark.')
|
|
131
|
-
.
|
|
122
|
+
.requiredOption('--spid <spid>', 'project workspace identifier')
|
|
132
123
|
.requiredOption('--env <env>', 'project environment')
|
|
133
124
|
.option('--org <id>', 'organization id; defaults to the org bound to the current token')
|
|
134
125
|
.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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"}
|