@supersdk/supercli 0.3.3 → 0.3.4

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 (67) hide show
  1. package/dist/build/artifactIntegrity.js +158 -2
  2. package/dist/build/artifactIntegrity.js.map +1 -1
  3. package/dist/build/projectBuild.js +335 -0
  4. package/dist/build/projectBuild.js.map +1 -0
  5. package/dist/cli.js +0 -2
  6. package/dist/cli.js.map +1 -1
  7. package/dist/commands/add.js +35 -29
  8. package/dist/commands/add.js.map +1 -1
  9. package/dist/commands/build.js +407 -105
  10. package/dist/commands/build.js.map +1 -1
  11. package/dist/commands/init.js +22 -29
  12. package/dist/commands/init.js.map +1 -1
  13. package/dist/commands/register.js +62 -217
  14. package/dist/commands/register.js.map +1 -1
  15. package/dist/config/appConfig.js +36 -163
  16. package/dist/config/appConfig.js.map +1 -1
  17. package/dist/config/superConfig.js +213 -185
  18. package/dist/config/superConfig.js.map +1 -1
  19. package/dist/deploy/manifest.js +189 -167
  20. package/dist/deploy/manifest.js.map +1 -1
  21. package/dist/deploy/preflight.js +15 -16
  22. package/dist/deploy/preflight.js.map +1 -1
  23. package/dist/deploy/runAdapter.js +7 -4
  24. package/dist/deploy/runAdapter.js.map +1 -1
  25. package/dist/docker/dockerCli.js +72 -77
  26. package/dist/docker/dockerCli.js.map +1 -1
  27. package/dist/template/README.md +26 -94
  28. package/dist/template/android/gradle/supersdk-config-reader.gradle +13 -62
  29. package/dist/template/android/scripts/build.sh +11 -0
  30. package/dist/template/ios/project.yml +1 -1
  31. package/dist/template/ios/scripts/build.sh +19 -0
  32. package/dist/template/ios/scripts/render_project.py +60 -0
  33. package/dist/template/ios/supersdk-default.config.json +6 -0
  34. package/dist/template/service/scripts/build.sh +11 -0
  35. package/dist/template/super.json +22 -14
  36. package/dist/template/template_manifest.json +3 -7
  37. package/dist/template/web/package.json +8 -0
  38. package/dist/template/web/scripts/build.sh +8 -0
  39. package/dist/template/web/scripts/web_package.py +490 -0
  40. package/dist/template/web/src/js/app.js +2 -2
  41. package/dist/util/shell.js +3 -3
  42. package/dist/workspace/config.js +3 -79
  43. package/dist/workspace/config.js.map +1 -1
  44. package/dist/workspace/identity.js +6 -15
  45. package/dist/workspace/identity.js.map +1 -1
  46. package/dist/workspace/projectIdentity.js +2 -7
  47. package/dist/workspace/projectIdentity.js.map +1 -1
  48. package/dist/workspace/template.js +205 -77
  49. package/dist/workspace/template.js.map +1 -1
  50. package/package.json +4 -1
  51. package/dist/commands/config.js +0 -170
  52. package/dist/commands/config.js.map +0 -1
  53. package/dist/template/scripts/android_snapshot_canary.py +0 -145
  54. package/dist/template/scripts/build_android.sh +0 -382
  55. package/dist/template/scripts/build_ios.sh +0 -331
  56. package/dist/template/scripts/build_service.sh +0 -89
  57. package/dist/template/scripts/build_site.sh +0 -57
  58. package/dist/template/scripts/lib/workspace.sh +0 -43
  59. package/dist/template/scripts/serve_web.py +0 -78
  60. package/dist/template/scripts/super_build_orchestrator.py +0 -344
  61. package/dist/template/scripts/supersdk_template.py +0 -1394
  62. package/dist/template/scripts/web_host_validator.py +0 -103
  63. package/dist/template/scripts/web_package.py +0 -296
  64. package/dist/template/scripts/ws03_shared_schema_merge_guard.py +0 -73
  65. package/dist/template/super_build.sh +0 -70
  66. package/dist/workspace/inspect.js +0 -275
  67. package/dist/workspace/inspect.js.map +0 -1
@@ -1,382 +0,0 @@
1
- #!/usr/bin/env bash
2
- set -euo pipefail
3
-
4
- SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
5
- # shellcheck source=lib/workspace.sh
6
- . "$SCRIPT_DIR/lib/workspace.sh"
7
- WORKSPACE_ROOT="$(supersdk_require_workspace_root "$SCRIPT_DIR")"
8
- PYTHON_BIN="${PYTHON_BIN:-python3}"
9
- HELPER="$WORKSPACE_ROOT/scripts/supersdk_template.py"
10
- CONFIG="$WORKSPACE_ROOT/super.json"
11
- PROJECT_ID=""
12
- PROJECT_DIR=""
13
- OUTPUT_DIR=""
14
- EVIDENCE_PATH=""
15
-
16
- usage() {
17
- echo "Usage: scripts/build_android.sh --build --config PATH --project-id ID --output-dir DIR --evidence FILE" >&2
18
- }
19
-
20
- skip_toolchain() {
21
- echo "SKIP_ANDROID_TOOLCHAIN_MISSING: $1" >&2
22
- exit 0
23
- }
24
-
25
- requires_non_skip_snapshot_canary() {
26
- [ "${SUPERSDK_CI_GATE:-}" = "ws03-android-template-nonskip" ]
27
- }
28
-
29
- run_snapshot_canary() {
30
- canary_output="$("$PYTHON_BIN" "$WORKSPACE_ROOT/scripts/android_snapshot_canary.py" --root "$WORKSPACE_ROOT" --project "$PROJECT_DIR" --config "$CONFIG" 2>&1)" || {
31
- printf '%s\n' "$canary_output" >&2
32
- exit 1
33
- }
34
- if [ -n "$canary_output" ]; then
35
- printf '%s\n' "$canary_output" >&2
36
- if requires_non_skip_snapshot_canary; then
37
- echo "FAIL_NONSKIP_GATE_NETWORK_SKIP: ws03 android gate requires remote Maven snapshot verification before Gradle" >&2
38
- exit 1
39
- fi
40
- echo "BUILD SKIPPED (network): Android snapshot canary did not permit Gradle" >&2
41
- exit 0
42
- fi
43
- }
44
-
45
- find_sdk_build_tool() {
46
- tool_name="$1"
47
- if [ -n "$sdk_dir" ] && [ -d "$sdk_dir/build-tools" ]; then
48
- find "$sdk_dir/build-tools" -path "*/$tool_name" -type f | sort | tail -n 1
49
- fi
50
- }
51
-
52
- dump_badging() {
53
- apk="$1"
54
- for tool_name in aapt aapt2; do
55
- aapt_tool="$(find_sdk_build_tool "$tool_name")"
56
- if [ -n "$aapt_tool" ]; then
57
- badging="$("$aapt_tool" dump badging "$apk" 2>/dev/null || true)"
58
- if printf '%s\n' "$badging" | grep -q "^package: name='"; then
59
- printf '%s\n' "$badging"
60
- return 0
61
- fi
62
- fi
63
- done
64
- echo "Android SDK build-tools aapt or aapt2 is required to verify final APK applicationId" >&2
65
- exit 1
66
- }
67
-
68
- # badging 的 package 行形如:package: name='x' versionCode='1' versionName='1.0.0' ...
69
- extract_badging_field() {
70
- field="$1"
71
- sed -n "s/^package:.*[[:space:]]$field='\([^']*\)'.*/\1/p" "$badging_file" | head -n 1
72
- }
73
-
74
- extract_agp_version() {
75
- sed -n 's/.*id("com\.android\.application") version "\([^"]*\)".*/\1/p' "$ANDROID_ROOT/build.gradle.kts" | head -n 1
76
- }
77
-
78
- extract_compile_sdk() {
79
- sed -n 's/^[[:space:]]*compileSdk[[:space:]]*=[[:space:]]*\([0-9][0-9]*\).*/\1/p' "$ANDROID_ROOT/app/build.gradle.kts" | head -n 1
80
- }
81
-
82
- build_seen=false
83
- while [ "$#" -gt 0 ]; do
84
- case "$1" in
85
- --build)
86
- if [ "$build_seen" = true ]; then
87
- usage
88
- exit 2
89
- fi
90
- build_seen=true
91
- shift
92
- ;;
93
- --project-id)
94
- if [ "$#" -lt 2 ]; then
95
- usage
96
- exit 2
97
- fi
98
- PROJECT_ID="$2"
99
- shift 2
100
- ;;
101
- --config)
102
- if [ "$#" -lt 2 ]; then
103
- usage
104
- exit 2
105
- fi
106
- CONFIG="$2"
107
- shift 2
108
- ;;
109
- --output-dir)
110
- if [ "$#" -lt 2 ]; then usage; exit 2; fi
111
- OUTPUT_DIR="$2"; shift 2 ;;
112
- --evidence)
113
- if [ "$#" -lt 2 ]; then usage; exit 2; fi
114
- EVIDENCE_PATH="$2"; shift 2 ;;
115
- *)
116
- usage
117
- exit 2
118
- ;;
119
- esac
120
- done
121
- if [ "$build_seen" = false ]; then
122
- build_seen=true
123
- fi
124
-
125
- # 项目目录来自配置,不是固定层级。省略 --project 时由引擎解析:唯一 android 项目才放行,
126
- # 多个就要求显式指定,绝不「挑第一个」。
127
- if [ -z "$PROJECT_ID" ]; then PROJECT_ID="android"; fi
128
- PROJECT_DIR="$("$PYTHON_BIN" "$HELPER" resolve --config "$CONFIG" --platform android --project "$PROJECT_ID")"
129
- ANDROID_ROOT="$WORKSPACE_ROOT/$PROJECT_DIR"
130
- if [ -z "$OUTPUT_DIR" ]; then OUTPUT_DIR="$ANDROID_ROOT/.supersdk/artifacts"; fi
131
- if [ -z "$EVIDENCE_PATH" ]; then EVIDENCE_PATH="$ANDROID_ROOT/.supersdk/evidence/android-helper-evidence.json"; fi
132
-
133
- "$PYTHON_BIN" "$HELPER" inject --root "$WORKSPACE_ROOT" --config "$CONFIG" --platform android --project "$PROJECT_ID"
134
-
135
- if [ "${SUPERSDK_ANDROID_BUILD_TEST_MODE:-0}" = "1" ]; then
136
- run_snapshot_canary
137
- mkdir -p "$OUTPUT_DIR"
138
- printf 'SUPERSDK_ANDROID_BUILD_TEST_MODE\n' > "$OUTPUT_DIR/app-debug.apk"
139
- echo "SUPERSDK_ANDROID_BUILD_TEST_MODE: would run $ANDROID_ROOT/gradlew :app:assembleDebug"
140
- exit 0
141
- fi
142
-
143
- if [ ! -x "$ANDROID_ROOT/gradlew" ] || [ ! -f "$ANDROID_ROOT/gradle/wrapper/gradle-wrapper.jar" ]; then
144
- skip_toolchain "missing Gradle wrapper; expected $PROJECT_DIR/gradlew and $PROJECT_DIR/gradle/wrapper/gradle-wrapper.jar"
145
- fi
146
-
147
- if ! command -v java >/dev/null 2>&1; then
148
- skip_toolchain "missing JDK; java executable is required"
149
- fi
150
-
151
- java_output="$(java -version 2>&1)"
152
- java_line="$(printf '%s\n' "$java_output" | sed -nE 's/.*version "[^"]+".*/&/p' | head -n 1)"
153
- java_major="$(printf '%s\n' "$java_output" | sed -nE 's/.*version "([0-9]+).*/\1/p' | head -n 1)"
154
- case "$java_major" in
155
- ""|*[!0-9]*)
156
- echo "Android build requires JDK 17 or newer; could not parse java -version output: $java_output" >&2
157
- exit 1
158
- ;;
159
- esac
160
- if [ "$java_major" -lt 17 ]; then
161
- echo "Android build requires JDK 17 or newer; found: $java_line" >&2
162
- exit 1
163
- fi
164
-
165
- sdk_dir=""
166
- if [ -f "$ANDROID_ROOT/local.properties" ]; then
167
- sdk_dir="$(sed -n 's/^sdk\.dir=//p' "$ANDROID_ROOT/local.properties" | tail -n 1)"
168
- fi
169
- if [ -z "$sdk_dir" ] && [ -n "${ANDROID_HOME:-}" ]; then
170
- sdk_dir="$ANDROID_HOME"
171
- fi
172
- if [ -z "$sdk_dir" ] && [ -n "${ANDROID_SDK_ROOT:-}" ]; then
173
- sdk_dir="$ANDROID_SDK_ROOT"
174
- fi
175
- if [ -z "$sdk_dir" ] && [ -d "$HOME/Library/Android/sdk" ]; then
176
- sdk_dir="$HOME/Library/Android/sdk"
177
- fi
178
- if [ -z "$sdk_dir" ] && [ -d "$HOME/Android/Sdk" ]; then
179
- sdk_dir="$HOME/Android/Sdk"
180
- fi
181
- if [ -z "$sdk_dir" ]; then
182
- if [ -n "${SUPERSDK_ANDROID_SDK_SEARCH_PATHS+x}" ]; then
183
- sdk_search_paths="$SUPERSDK_ANDROID_SDK_SEARCH_PATHS"
184
- else
185
- sdk_search_paths="/opt/android-sdk"
186
- fi
187
- old_ifs="$IFS"
188
- IFS=':'
189
- for candidate in $sdk_search_paths; do
190
- if [ -n "$candidate" ] && [ -d "$candidate" ]; then
191
- sdk_dir="$candidate"
192
- break
193
- fi
194
- done
195
- IFS="$old_ifs"
196
- fi
197
- if [ -z "$sdk_dir" ] || [ ! -d "$sdk_dir" ]; then
198
- skip_toolchain "missing Android SDK; checked $PROJECT_DIR/local.properties sdk.dir, ANDROID_HOME, ANDROID_SDK_ROOT, ~/Library/Android/sdk, ~/Android/Sdk, and /opt/android-sdk"
199
- fi
200
-
201
- # 🔴 检测到的 sdk_dir 必须真的传给 Gradle,否则这段搜索白做:环境里恰好有 ANDROID_HOME 时
202
- # 一切正常,没有时 Gradle 直接报 "SDK location not found" —— 而上面那句 skip 又不会触发
203
- # (SDK 明明找到了),于是名字里写着 `_or_toolchain_skip` 的用例变成硬失败。
204
- # 不写 local.properties:那是用户自己的文件、且被 .gitignore 排除,构建脚本不该改它。
205
- export ANDROID_HOME="${ANDROID_HOME:-$sdk_dir}"
206
- export ANDROID_SDK_ROOT="${ANDROID_SDK_ROOT:-$sdk_dir}"
207
-
208
- run_snapshot_canary
209
-
210
- evidence_dir="$ANDROID_ROOT/.supersdk/evidence"
211
- mkdir -p "$evidence_dir"
212
- assemble_debug_log="$evidence_dir/assemble-debug.log"
213
- tasks=(":app:assembleDebug")
214
- if [ "${SUPERSDK_CI_GATE:-}" = "ws03-android-template-nonskip" ]; then
215
- tasks+=(":app:testDebugUnitTest")
216
- fi
217
-
218
- set +e
219
- (
220
- cd "$ANDROID_ROOT"
221
- ./gradlew "${tasks[@]}"
222
- ) >"$assemble_debug_log" 2>&1
223
- gradle_status=$?
224
- set -e
225
- cat "$assemble_debug_log"
226
- if [ "$gradle_status" -ne 0 ]; then
227
- exit "$gradle_status"
228
- fi
229
-
230
- apk_path="$(find "$ANDROID_ROOT/app/build/outputs/apk/debug" -name '*.apk' | head -n 1)"
231
- if [ -z "$apk_path" ]; then
232
- echo "Android build did not produce a debug APK under $PROJECT_DIR/app/build/outputs/apk/debug" >&2
233
- exit 1
234
- fi
235
- badging_file="$evidence_dir/apk-badging.txt"
236
- dump_badging "$apk_path" >"$badging_file"
237
- final_application_id="$(extract_badging_field name)"
238
- if [ -z "$final_application_id" ]; then
239
- echo "aapt could not read final APK applicationId from $apk_path" >&2
240
- exit 1
241
- fi
242
- final_version_name="$(extract_badging_field versionName)"
243
- final_version_code="$(extract_badging_field versionCode)"
244
- agp_version="$(extract_agp_version)"
245
- compile_sdk="$(extract_compile_sdk)"
246
- if [ -z "$agp_version" ] || [ -z "$compile_sdk" ]; then
247
- echo "Could not derive AGP version or compileSdk from Gradle templates" >&2
248
- exit 1
249
- fi
250
- gradle_version="$("$ANDROID_ROOT/gradlew" --version 2>/dev/null | sed -n 's/^Gradle //p' | head -n 1)"
251
- wrapper_jar_sha="$(shasum -a 256 "$ANDROID_ROOT/gradle/wrapper/gradle-wrapper.jar" | awk '{print $1}')"
252
- wrapper_sha="$(sed -n 's/^distributionSha256Sum=//p' "$ANDROID_ROOT/gradle/wrapper/gradle-wrapper.properties")"
253
- merged_manifest="$(find "$ANDROID_ROOT/app/build/intermediates" -path '*merged*manifest*' -name AndroidManifest.xml | head -n 1)"
254
- if [ -z "$gradle_version" ] || [ -z "$wrapper_jar_sha" ] || [ -z "$wrapper_sha" ] || [ -z "$merged_manifest" ]; then
255
- echo "Could not derive complete Android build evidence fields" >&2
256
- echo "gradleVersion=$gradle_version wrapperJarSha256=$wrapper_jar_sha wrapperDistributionSha256Sum=$wrapper_sha mergedManifestPath=$merged_manifest" >&2
257
- exit 1
258
- fi
259
- "$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'
260
- import json
261
- import sys
262
- from pathlib import Path
263
-
264
- 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:]
265
- config = json.loads((Path(android_root) / ".supersdk/managed/config.json").read_text(encoding="utf-8"))
266
- version = config["sdk"]["androidVersion"]
267
- declared_application_id = config["platform_config"]["package"]
268
-
269
- # 🔴 声明身份与产物身份必须当场比对。二者一直被并排写进 evidence,却从不比较 ——
270
- # 于是「工程根本没 apply supersdk-config-reader.gradle」时,注入的 managed config 无人读取,
271
- # Gradle 照常 BUILD SUCCESSFUL,脚本 exit 0,而 APK 里装的是工程自己硬编码的身份。
272
- # 那正是最危险的一类失败:没有任何一处报错,错误要到分发环节才暴露。
273
- #
274
- # 分三档,不搞「一律硬失败」:
275
- # * 完全一致 -> 静默(模板正常路径)
276
- # * 只多了 .后缀 -> 告警放行(applicationIdSuffix 是既有工程的常见合法写法)
277
- # * 其余不一致 -> 硬失败,构建不产出「身份是错的」的成功
278
- # 版本号只告警:versionNameSuffix 之类同样合法,而且版本不对不像包名那样会装错 App。
279
- identity_mismatches = []
280
- identity_status = "match"
281
- if final_application_id != declared_application_id:
282
- identity_status = (
283
- "warning" if final_application_id.startswith(declared_application_id + ".") else "mismatch"
284
- )
285
- identity_mismatches.append(
286
- {
287
- "field": "applicationId",
288
- "declared": declared_application_id,
289
- "final": final_application_id,
290
- }
291
- )
292
- # version 在 schema 里是必填,但这段是**构建的最后一道闸**:因为一个缺字段就抛 KeyError、
293
- # 把「身份检查」变成一条看不懂的 traceback,代价远大于跳过版本号比对。
294
- declared_version = config.get("version") or {}
295
- declared_version_name = str(declared_version.get("name", ""))
296
- declared_version_code = str(declared_version.get("code", ""))
297
- if final_version_name and declared_version_name and final_version_name != declared_version_name:
298
- identity_mismatches.append(
299
- {"field": "versionName", "declared": declared_version_name, "final": final_version_name}
300
- )
301
- if final_version_code and declared_version_code and final_version_code != declared_version_code:
302
- identity_mismatches.append(
303
- {"field": "versionCode", "declared": declared_version_code, "final": final_version_code}
304
- )
305
- if identity_status == "match" and identity_mismatches:
306
- identity_status = "warning"
307
-
308
- payload = {
309
- "skip": False,
310
- "apkPath": apk_path,
311
- "projectDir": config["dir"],
312
- "declaredApplicationId": declared_application_id,
313
- "finalApplicationId": final_application_id,
314
- "declaredVersionName": declared_version_name,
315
- "finalVersionName": final_version_name,
316
- "declaredVersionCode": declared_version_code,
317
- "finalVersionCode": final_version_code,
318
- "identityCheck": {"status": identity_status, "mismatches": identity_mismatches},
319
- "mergedManifestPath": merged_manifest,
320
- "gradleVersion": gradle_version,
321
- "javaVersion": java_version,
322
- "agpVersion": agp_version,
323
- "compileSdk": int(compile_sdk),
324
- "wrapperJarSha256": wrapper_jar_sha,
325
- "wrapperDistributionSha256Sum": wrapper_sha,
326
- "assembleDebugConfigurationLog": assemble_debug_log,
327
- "declaredMavenCoordinates": [
328
- f"com.supersdk:supersdk:{version}",
329
- f"com.supersdk:supersdk-api:{version}",
330
- f"com.supersdk:supersdk-impl:{version}",
331
- f"com.supersdk:supersdk-base:{version}",
332
- ],
333
- }
334
- Path(target).write_text(json.dumps(payload, indent=2, sort_keys=True) + "\n", encoding="utf-8")
335
-
336
- if identity_mismatches:
337
- lines = [
338
- "",
339
- "SuperSDK identity check %s: the APK does not carry the identity declared in super.json."
340
- % ("FAILED" if identity_status == "mismatch" else "warning"),
341
- "",
342
- ]
343
- width = max(len(item["field"]) for item in identity_mismatches)
344
- for item in identity_mismatches:
345
- lines.append(
346
- " %-*s declared %r -> built %r" % (width, item["field"], item["declared"], item["final"])
347
- )
348
- lines += [
349
- "",
350
- " project : %s" % config["dir"],
351
- " apk : %s" % apk_path,
352
- " evidence: %s" % target,
353
- "",
354
- ]
355
- if identity_status == "mismatch":
356
- lines += [
357
- "The managed config was projected to %s/.supersdk/managed/config.json, but this Gradle"
358
- % config["dir"],
359
- "build did not read it: nothing applies gradle/supersdk-config-reader.gradle, so the project",
360
- "kept its own hardcoded identity and the projected one was ignored.",
361
- "",
362
- "Failing here is deliberate. Without this check the build exits 0 and ships an artifact whose",
363
- "identity is not the one you configured -- a failure that would only surface at distribution.",
364
- "",
365
- "Fix it one of two ways:",
366
- " * wire the project to the managed config -- `supercli register android %s` reprints the"
367
- % config["dir"],
368
- " exact steps (copy the reader, apply it, read the extra properties); or",
369
- " * correct projects[].package in super.json so it states what this project really builds.",
370
- ]
371
- sys.stderr.write("\n".join(lines) + "\n")
372
- raise SystemExit(1)
373
- lines += [
374
- "This is a warning, not a failure: an applicationIdSuffix / versionNameSuffix produces exactly",
375
- "this shape and is legitimate. Confirm the difference above is one you intended.",
376
- ]
377
- sys.stderr.write("\n".join(lines) + "\n")
378
- PY
379
-
380
- mkdir -p "$OUTPUT_DIR" "$(dirname "$EVIDENCE_PATH")"
381
- cp "$apk_path" "$OUTPUT_DIR/$(basename "$apk_path")"
382
- cp "$evidence_dir/android-build-evidence.json" "$EVIDENCE_PATH"