@supersdk/supercli 0.3.0 → 0.3.1-staging.40
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/api/analyticsClient.js +48 -0
- package/dist/api/analyticsClient.js.map +1 -0
- package/dist/api/consoleClient.js +58 -42
- package/dist/api/consoleClient.js.map +1 -1
- package/dist/api/dbClient.js +90 -0
- package/dist/api/dbClient.js.map +1 -0
- package/dist/api/settingsClient.js +43 -0
- package/dist/api/settingsClient.js.map +1 -0
- package/dist/cli.js +24 -2
- package/dist/cli.js.map +1 -1
- package/dist/commands/add.js +67 -226
- package/dist/commands/add.js.map +1 -1
- package/dist/commands/analytics.js +265 -0
- package/dist/commands/analytics.js.map +1 -0
- package/dist/commands/db.js +590 -0
- package/dist/commands/db.js.map +1 -0
- package/dist/commands/deploy.js +883 -0
- package/dist/commands/deploy.js.map +1 -0
- package/dist/commands/env.js +53 -0
- package/dist/commands/env.js.map +1 -0
- package/dist/commands/image.js +471 -0
- package/dist/commands/image.js.map +1 -0
- package/dist/commands/logs.js +131 -0
- package/dist/commands/logs.js.map +1 -0
- package/dist/commands/publishSite.js +28 -10
- package/dist/commands/publishSite.js.map +1 -1
- package/dist/commands/register.js +363 -0
- package/dist/commands/register.js.map +1 -0
- package/dist/commands/settings.js +307 -0
- package/dist/commands/settings.js.map +1 -0
- package/dist/commands/sqlInput.js +48 -0
- package/dist/commands/sqlInput.js.map +1 -0
- package/dist/docker/dockerCli.js +301 -0
- package/dist/docker/dockerCli.js.map +1 -0
- package/dist/docker/registry.js +128 -0
- package/dist/docker/registry.js.map +1 -0
- package/dist/generated/log_contract.js +33 -0
- package/dist/generated/log_contract.js.map +1 -0
- package/dist/output/envelope.js +20 -5
- package/dist/output/envelope.js.map +1 -1
- package/dist/output/resultPrinter.js +35 -6
- package/dist/output/resultPrinter.js.map +1 -1
- package/dist/publish/registryClient.js +128 -0
- package/dist/publish/registryClient.js.map +1 -0
- package/dist/publish/runClient.js +495 -0
- package/dist/publish/runClient.js.map +1 -0
- package/dist/template/scripts/build_android.sh +107 -8
- package/dist/template/scripts/web_package.py +15 -3
- package/dist/template/web/src/js/app.js +3 -2
- package/dist/template/web/src/js/supersdk.js +1 -2024
- package/dist/template/web/src/js/supersdk.provenance.json +5 -4
- package/dist/util/prompt.js +7 -2
- package/dist/util/prompt.js.map +1 -1
- package/dist/workspace/config.js +1 -0
- package/dist/workspace/config.js.map +1 -1
- package/dist/workspace/inspect.js +274 -0
- package/dist/workspace/inspect.js.map +1 -0
- package/dist/workspace/projectIdentity.js +255 -0
- package/dist/workspace/projectIdentity.js.map +1 -0
- package/package.json +4 -4
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runClient.js","sourceRoot":"","sources":["../../src/publish/runClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,14 +46,14 @@ find_sdk_build_tool() {
|
|
|
46
46
|
fi
|
|
47
47
|
}
|
|
48
48
|
|
|
49
|
-
|
|
49
|
+
dump_badging() {
|
|
50
50
|
apk="$1"
|
|
51
51
|
for tool_name in aapt aapt2; do
|
|
52
52
|
aapt_tool="$(find_sdk_build_tool "$tool_name")"
|
|
53
53
|
if [ -n "$aapt_tool" ]; then
|
|
54
|
-
|
|
55
|
-
if
|
|
56
|
-
printf '%s\n' "$
|
|
54
|
+
badging="$("$aapt_tool" dump badging "$apk" 2>/dev/null || true)"
|
|
55
|
+
if printf '%s\n' "$badging" | grep -q "^package: name='"; then
|
|
56
|
+
printf '%s\n' "$badging"
|
|
57
57
|
return 0
|
|
58
58
|
fi
|
|
59
59
|
fi
|
|
@@ -62,6 +62,12 @@ extract_final_application_id() {
|
|
|
62
62
|
exit 1
|
|
63
63
|
}
|
|
64
64
|
|
|
65
|
+
# badging 的 package 行形如:package: name='x' versionCode='1' versionName='1.0.0' ...
|
|
66
|
+
extract_badging_field() {
|
|
67
|
+
field="$1"
|
|
68
|
+
sed -n "s/^package:.*[[:space:]]$field='\([^']*\)'.*/\1/p" "$badging_file" | head -n 1
|
|
69
|
+
}
|
|
70
|
+
|
|
65
71
|
extract_agp_version() {
|
|
66
72
|
sed -n 's/.*id("com\.android\.application") version "\([^"]*\)".*/\1/p' "$ANDROID_ROOT/build.gradle.kts" | head -n 1
|
|
67
73
|
}
|
|
@@ -214,11 +220,15 @@ if [ -z "$apk_path" ]; then
|
|
|
214
220
|
echo "Android build did not produce a debug APK under $PROJECT_DIR/app/build/outputs/apk/debug" >&2
|
|
215
221
|
exit 1
|
|
216
222
|
fi
|
|
217
|
-
|
|
223
|
+
badging_file="$evidence_dir/apk-badging.txt"
|
|
224
|
+
dump_badging "$apk_path" >"$badging_file"
|
|
225
|
+
final_application_id="$(extract_badging_field name)"
|
|
218
226
|
if [ -z "$final_application_id" ]; then
|
|
219
227
|
echo "aapt could not read final APK applicationId from $apk_path" >&2
|
|
220
228
|
exit 1
|
|
221
229
|
fi
|
|
230
|
+
final_version_name="$(extract_badging_field versionName)"
|
|
231
|
+
final_version_code="$(extract_badging_field versionCode)"
|
|
222
232
|
agp_version="$(extract_agp_version)"
|
|
223
233
|
compile_sdk="$(extract_compile_sdk)"
|
|
224
234
|
if [ -z "$agp_version" ] || [ -z "$compile_sdk" ]; then
|
|
@@ -234,20 +244,66 @@ if [ -z "$gradle_version" ] || [ -z "$wrapper_jar_sha" ] || [ -z "$wrapper_sha"
|
|
|
234
244
|
echo "gradleVersion=$gradle_version wrapperJarSha256=$wrapper_jar_sha wrapperDistributionSha256Sum=$wrapper_sha mergedManifestPath=$merged_manifest" >&2
|
|
235
245
|
exit 1
|
|
236
246
|
fi
|
|
237
|
-
"$PYTHON_BIN" - "$evidence_dir/android-build-evidence.json" "$ANDROID_ROOT" "$apk_path" "$final_application_id" "$agp_version" "$compile_sdk" "$gradle_version" "$java_line" "$wrapper_jar_sha" "$wrapper_sha" "$merged_manifest" "$assemble_debug_log" <<'PY'
|
|
247
|
+
"$PYTHON_BIN" - "$evidence_dir/android-build-evidence.json" "$ANDROID_ROOT" "$apk_path" "$final_application_id" "$final_version_name" "$final_version_code" "$agp_version" "$compile_sdk" "$gradle_version" "$java_line" "$wrapper_jar_sha" "$wrapper_sha" "$merged_manifest" "$assemble_debug_log" <<'PY'
|
|
238
248
|
import json
|
|
239
249
|
import sys
|
|
240
250
|
from pathlib import Path
|
|
241
251
|
|
|
242
|
-
target, android_root, apk_path, final_application_id, agp_version, compile_sdk, gradle_version, java_version, wrapper_jar_sha, wrapper_sha, merged_manifest, assemble_debug_log = sys.argv[1:]
|
|
252
|
+
target, android_root, apk_path, final_application_id, final_version_name, final_version_code, agp_version, compile_sdk, gradle_version, java_version, wrapper_jar_sha, wrapper_sha, merged_manifest, assemble_debug_log = sys.argv[1:]
|
|
243
253
|
config = json.loads((Path(android_root) / ".supersdk/managed/config.json").read_text(encoding="utf-8"))
|
|
244
254
|
version = config["sdk"]["androidVersion"]
|
|
255
|
+
declared_application_id = config["platform_config"]["package"]
|
|
256
|
+
|
|
257
|
+
# 🔴 声明身份与产物身份必须当场比对。二者一直被并排写进 evidence,却从不比较 ——
|
|
258
|
+
# 于是「工程根本没 apply supersdk-config-reader.gradle」时,注入的 managed config 无人读取,
|
|
259
|
+
# Gradle 照常 BUILD SUCCESSFUL,脚本 exit 0,而 APK 里装的是工程自己硬编码的身份。
|
|
260
|
+
# 那正是最危险的一类失败:没有任何一处报错,错误要到分发环节才暴露。
|
|
261
|
+
#
|
|
262
|
+
# 分三档,不搞「一律硬失败」:
|
|
263
|
+
# * 完全一致 -> 静默(模板正常路径)
|
|
264
|
+
# * 只多了 .后缀 -> 告警放行(applicationIdSuffix 是既有工程的常见合法写法)
|
|
265
|
+
# * 其余不一致 -> 硬失败,构建不产出「身份是错的」的成功
|
|
266
|
+
# 版本号只告警:versionNameSuffix 之类同样合法,而且版本不对不像包名那样会装错 App。
|
|
267
|
+
identity_mismatches = []
|
|
268
|
+
identity_status = "match"
|
|
269
|
+
if final_application_id != declared_application_id:
|
|
270
|
+
identity_status = (
|
|
271
|
+
"warning" if final_application_id.startswith(declared_application_id + ".") else "mismatch"
|
|
272
|
+
)
|
|
273
|
+
identity_mismatches.append(
|
|
274
|
+
{
|
|
275
|
+
"field": "applicationId",
|
|
276
|
+
"declared": declared_application_id,
|
|
277
|
+
"final": final_application_id,
|
|
278
|
+
}
|
|
279
|
+
)
|
|
280
|
+
# version 在 schema 里是必填,但这段是**构建的最后一道闸**:因为一个缺字段就抛 KeyError、
|
|
281
|
+
# 把「身份检查」变成一条看不懂的 traceback,代价远大于跳过版本号比对。
|
|
282
|
+
declared_version = config.get("version") or {}
|
|
283
|
+
declared_version_name = str(declared_version.get("name", ""))
|
|
284
|
+
declared_version_code = str(declared_version.get("code", ""))
|
|
285
|
+
if final_version_name and declared_version_name and final_version_name != declared_version_name:
|
|
286
|
+
identity_mismatches.append(
|
|
287
|
+
{"field": "versionName", "declared": declared_version_name, "final": final_version_name}
|
|
288
|
+
)
|
|
289
|
+
if final_version_code and declared_version_code and final_version_code != declared_version_code:
|
|
290
|
+
identity_mismatches.append(
|
|
291
|
+
{"field": "versionCode", "declared": declared_version_code, "final": final_version_code}
|
|
292
|
+
)
|
|
293
|
+
if identity_status == "match" and identity_mismatches:
|
|
294
|
+
identity_status = "warning"
|
|
295
|
+
|
|
245
296
|
payload = {
|
|
246
297
|
"skip": False,
|
|
247
298
|
"apkPath": apk_path,
|
|
248
299
|
"projectDir": config["dir"],
|
|
249
|
-
"declaredApplicationId":
|
|
300
|
+
"declaredApplicationId": declared_application_id,
|
|
250
301
|
"finalApplicationId": final_application_id,
|
|
302
|
+
"declaredVersionName": declared_version_name,
|
|
303
|
+
"finalVersionName": final_version_name,
|
|
304
|
+
"declaredVersionCode": declared_version_code,
|
|
305
|
+
"finalVersionCode": final_version_code,
|
|
306
|
+
"identityCheck": {"status": identity_status, "mismatches": identity_mismatches},
|
|
251
307
|
"mergedManifestPath": merged_manifest,
|
|
252
308
|
"gradleVersion": gradle_version,
|
|
253
309
|
"javaVersion": java_version,
|
|
@@ -264,4 +320,47 @@ payload = {
|
|
|
264
320
|
],
|
|
265
321
|
}
|
|
266
322
|
Path(target).write_text(json.dumps(payload, indent=2, sort_keys=True) + "\n", encoding="utf-8")
|
|
323
|
+
|
|
324
|
+
if identity_mismatches:
|
|
325
|
+
lines = [
|
|
326
|
+
"",
|
|
327
|
+
"SuperSDK identity check %s: the APK does not carry the identity declared in supersdk.json."
|
|
328
|
+
% ("FAILED" if identity_status == "mismatch" else "warning"),
|
|
329
|
+
"",
|
|
330
|
+
]
|
|
331
|
+
width = max(len(item["field"]) for item in identity_mismatches)
|
|
332
|
+
for item in identity_mismatches:
|
|
333
|
+
lines.append(
|
|
334
|
+
" %-*s declared %r -> built %r" % (width, item["field"], item["declared"], item["final"])
|
|
335
|
+
)
|
|
336
|
+
lines += [
|
|
337
|
+
"",
|
|
338
|
+
" project : %s" % config["dir"],
|
|
339
|
+
" apk : %s" % apk_path,
|
|
340
|
+
" evidence: %s" % target,
|
|
341
|
+
"",
|
|
342
|
+
]
|
|
343
|
+
if identity_status == "mismatch":
|
|
344
|
+
lines += [
|
|
345
|
+
"The managed config was projected to %s/.supersdk/managed/config.json, but this Gradle"
|
|
346
|
+
% config["dir"],
|
|
347
|
+
"build did not read it: nothing applies gradle/supersdk-config-reader.gradle, so the project",
|
|
348
|
+
"kept its own hardcoded identity and the projected one was ignored.",
|
|
349
|
+
"",
|
|
350
|
+
"Failing here is deliberate. Without this check the build exits 0 and ships an artifact whose",
|
|
351
|
+
"identity is not the one you configured -- a failure that would only surface at distribution.",
|
|
352
|
+
"",
|
|
353
|
+
"Fix it one of two ways:",
|
|
354
|
+
" * wire the project to the managed config -- `supercli register android %s` reprints the"
|
|
355
|
+
% config["dir"],
|
|
356
|
+
" exact steps (copy the reader, apply it, read the extra properties); or",
|
|
357
|
+
" * correct projects[].package in supersdk.json so it states what this project really builds.",
|
|
358
|
+
]
|
|
359
|
+
sys.stderr.write("\n".join(lines) + "\n")
|
|
360
|
+
raise SystemExit(1)
|
|
361
|
+
lines += [
|
|
362
|
+
"This is a warning, not a failure: an applicationIdSuffix / versionNameSuffix produces exactly",
|
|
363
|
+
"this shape and is legitimate. Confirm the difference above is one you intended.",
|
|
364
|
+
]
|
|
365
|
+
sys.stderr.write("\n".join(lines) + "\n")
|
|
267
366
|
PY
|
|
@@ -18,6 +18,7 @@ REQUIRED_ASSETS = ("index.html", "js/app.js", "js/supersdk.js", "css/style.css")
|
|
|
18
18
|
EXCLUDED_ASSETS = {"__super_meta.json", ".DS_Store", "js/supersdk.provenance.json"}
|
|
19
19
|
HEX64 = set("0123456789abcdef")
|
|
20
20
|
VERSION_PATTERN = re.compile(r"^[0-9]+\.[0-9]+\.[0-9]+$")
|
|
21
|
+
INTEGRITY_PATTERN = re.compile(r"^sha512-[A-Za-z0-9+/]+={0,2}$")
|
|
21
22
|
CONFIG_FILENAME = "supersdk.json"
|
|
22
23
|
|
|
23
24
|
# `<project>/src` is authored input; `<project>/dist` is the single publishable build
|
|
@@ -72,12 +73,23 @@ def validate_provenance(root):
|
|
|
72
73
|
provenance = json.loads(provenance_path.read_text(encoding="utf-8"))
|
|
73
74
|
except (OSError, json.JSONDecodeError, UnicodeDecodeError) as exc:
|
|
74
75
|
raise WebPackageError("supersdk.provenance.json: invalid JSON") from exc
|
|
75
|
-
|
|
76
|
+
expected_fields = {"package", "version", "integrity", "file", "sha256"}
|
|
77
|
+
if not isinstance(provenance, dict) or set(provenance) != expected_fields:
|
|
78
|
+
raise WebPackageError("supersdk.provenance.json: fields must match public artifact schema")
|
|
79
|
+
if provenance.get("package") != "@supersdk/jssdk":
|
|
80
|
+
raise WebPackageError("supersdk.provenance.json: package must be @supersdk/jssdk")
|
|
81
|
+
if not isinstance(provenance.get("version"), str) or not VERSION_PATTERN.fullmatch(provenance["version"]):
|
|
82
|
+
raise WebPackageError("supersdk.provenance.json: version must be x.y.z")
|
|
83
|
+
if not isinstance(provenance.get("integrity"), str) or not INTEGRITY_PATTERN.fullmatch(provenance["integrity"]):
|
|
84
|
+
raise WebPackageError("supersdk.provenance.json: integrity must be sha512 SRI")
|
|
85
|
+
if provenance.get("file") != "dist/supersdk.js":
|
|
86
|
+
raise WebPackageError("supersdk.provenance.json: file must be dist/supersdk.js")
|
|
87
|
+
vendored_hash = provenance.get("sha256")
|
|
76
88
|
if not isinstance(vendored_hash, str) or len(vendored_hash) != 64 or any(ch not in HEX64 for ch in vendored_hash):
|
|
77
|
-
raise WebPackageError("supersdk.provenance.json:
|
|
89
|
+
raise WebPackageError("supersdk.provenance.json: sha256 must be 64 hex")
|
|
78
90
|
actual = hashlib.sha256(vendored_path.read_bytes()).hexdigest()
|
|
79
91
|
if actual != vendored_hash:
|
|
80
|
-
raise WebPackageError("supersdk.provenance.json:
|
|
92
|
+
raise WebPackageError("supersdk.provenance.json: sha256 mismatch")
|
|
81
93
|
|
|
82
94
|
|
|
83
95
|
def validate_inputs(src, host, version, require_provenance=True):
|
|
@@ -129,10 +129,11 @@
|
|
|
129
129
|
var environment = readEnvironment();
|
|
130
130
|
setPickerEnabled(true, environment);
|
|
131
131
|
return loadConfig().then(function(config) {
|
|
132
|
-
window.SuperSDK.
|
|
132
|
+
window.SuperSDK.init({
|
|
133
133
|
spid: config.spid,
|
|
134
134
|
environment: environment,
|
|
135
|
-
appName: config.name
|
|
135
|
+
appName: config.name,
|
|
136
|
+
analyticsConsent: "denied"
|
|
136
137
|
});
|
|
137
138
|
clearDiagnostic();
|
|
138
139
|
renderConfig(config, environment);
|