@supersdk/supercli 0.3.2 → 0.3.3-staging.45

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 (93) hide show
  1. package/dist/build/artifactIntegrity.js +119 -0
  2. package/dist/build/artifactIntegrity.js.map +1 -0
  3. package/dist/cli.js +22 -11
  4. package/dist/cli.js.map +1 -1
  5. package/dist/commands/add.js +79 -31
  6. package/dist/commands/add.js.map +1 -1
  7. package/dist/commands/analytics.js +15 -9
  8. package/dist/commands/analytics.js.map +1 -1
  9. package/dist/commands/build.js +231 -0
  10. package/dist/commands/build.js.map +1 -0
  11. package/dist/commands/config.js +170 -0
  12. package/dist/commands/config.js.map +1 -0
  13. package/dist/commands/db.js +24 -19
  14. package/dist/commands/db.js.map +1 -1
  15. package/dist/commands/deploy.js +434 -751
  16. package/dist/commands/deploy.js.map +1 -1
  17. package/dist/commands/env.js +8 -8
  18. package/dist/commands/env.js.map +1 -1
  19. package/dist/commands/image.js +31 -20
  20. package/dist/commands/image.js.map +1 -1
  21. package/dist/commands/init.js +68 -37
  22. package/dist/commands/init.js.map +1 -1
  23. package/dist/commands/logs.js +16 -7
  24. package/dist/commands/logs.js.map +1 -1
  25. package/dist/commands/publishSite.js +28 -943
  26. package/dist/commands/publishSite.js.map +1 -1
  27. package/dist/commands/register.js +51 -30
  28. package/dist/commands/register.js.map +1 -1
  29. package/dist/commands/settings.js +10 -6
  30. package/dist/commands/settings.js.map +1 -1
  31. package/dist/config/appConfig.js +40 -36
  32. package/dist/config/appConfig.js.map +1 -1
  33. package/dist/config/superConfig.js +429 -0
  34. package/dist/config/superConfig.js.map +1 -0
  35. package/dist/deploy/adapterTypes.js +3 -0
  36. package/dist/deploy/adapterTypes.js.map +1 -0
  37. package/dist/deploy/manifest.js +381 -0
  38. package/dist/deploy/manifest.js.map +1 -0
  39. package/dist/deploy/preflight.js +202 -0
  40. package/dist/deploy/preflight.js.map +1 -0
  41. package/dist/deploy/resultWriter.js +178 -0
  42. package/dist/deploy/resultWriter.js.map +1 -0
  43. package/dist/deploy/runAdapter.js +299 -0
  44. package/dist/deploy/runAdapter.js.map +1 -0
  45. package/dist/deploy/siteAdapter.js +182 -0
  46. package/dist/deploy/siteAdapter.js.map +1 -0
  47. package/dist/docker/dockerCli.js +63 -1
  48. package/dist/docker/dockerCli.js.map +1 -1
  49. package/dist/output/envelope.js +5 -1
  50. package/dist/output/envelope.js.map +1 -1
  51. package/dist/output/resultPrinter.js +3 -0
  52. package/dist/output/resultPrinter.js.map +1 -1
  53. package/dist/publish/responseClassifier.js +4 -4
  54. package/dist/publish/responseClassifier.js.map +1 -1
  55. package/dist/publish/runClient.js +11 -11
  56. package/dist/publish/runClient.js.map +1 -1
  57. package/dist/publish/siteZip.js +4 -5
  58. package/dist/publish/siteZip.js.map +1 -1
  59. package/dist/template/README.md +64 -227
  60. package/dist/template/android/app/src/main/java/com/supersdk/simple/EnvironmentStore.java +1 -1
  61. package/dist/template/android/app/src/main/java/com/supersdk/simple/SimpleApplication.java +2 -2
  62. package/dist/template/android/gradle/supersdk-config-reader.gradle +6 -5
  63. package/dist/template/android/supersdk-default.config.json +3 -2
  64. package/dist/template/ios/Sources/App/AppDelegate.swift +1 -1
  65. package/dist/template/ios/Sources/App/SimpleSDKBootstrap.swift +1 -1
  66. package/dist/template/scripts/build_android.sh +26 -10
  67. package/dist/template/scripts/build_ios.sh +41 -9
  68. package/dist/template/scripts/build_service.sh +89 -0
  69. package/dist/template/scripts/build_site.sh +40 -26
  70. package/dist/template/scripts/lib/workspace.sh +4 -4
  71. package/dist/template/scripts/serve_web.py +2 -4
  72. package/dist/template/scripts/super_build_orchestrator.py +278 -355
  73. package/dist/template/scripts/supersdk_template.py +414 -181
  74. package/dist/template/scripts/web_package.py +9 -8
  75. package/dist/template/service/Dockerfile +2 -0
  76. package/dist/template/{supersdk.json → super.json} +20 -1
  77. package/dist/template/super_build.sh +39 -113
  78. package/dist/template/template_manifest.json +5 -4
  79. package/dist/workspace/config.js +81 -119
  80. package/dist/workspace/config.js.map +1 -1
  81. package/dist/workspace/identity.js +15 -14
  82. package/dist/workspace/identity.js.map +1 -1
  83. package/dist/workspace/inspect.js +1 -0
  84. package/dist/workspace/inspect.js.map +1 -1
  85. package/dist/workspace/projectContext.js +93 -0
  86. package/dist/workspace/projectContext.js.map +1 -0
  87. package/dist/workspace/projectIdentity.js +53 -96
  88. package/dist/workspace/projectIdentity.js.map +1 -1
  89. package/dist/workspace/template.js +5 -8
  90. package/dist/workspace/template.js.map +1 -1
  91. package/package.json +2 -2
  92. package/dist/publish/siteConfig.js +0 -649
  93. package/dist/publish/siteConfig.js.map +0 -1
@@ -7,11 +7,14 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
7
7
  WORKSPACE_ROOT="$(supersdk_require_workspace_root "$SCRIPT_DIR")"
8
8
  PYTHON_BIN="${PYTHON_BIN:-python3}"
9
9
  HELPER="$WORKSPACE_ROOT/scripts/supersdk_template.py"
10
- CONFIG="$WORKSPACE_ROOT/supersdk.json"
10
+ CONFIG="$WORKSPACE_ROOT/super.json"
11
+ PROJECT_ID=""
11
12
  PROJECT_DIR=""
13
+ OUTPUT_DIR=""
14
+ EVIDENCE_PATH=""
12
15
 
13
16
  usage() {
14
- echo "Usage: scripts/build_ios.sh --build [--project DIR]" >&2
17
+ echo "Usage: scripts/build_ios.sh --build --config PATH --project-id ID --output-dir DIR --evidence FILE" >&2
15
18
  }
16
19
 
17
20
  build_seen=false
@@ -25,14 +28,23 @@ while [ "$#" -gt 0 ]; do
25
28
  build_seen=true
26
29
  shift
27
30
  ;;
28
- --project)
31
+ --project-id)
29
32
  if [ "$#" -lt 2 ]; then
30
33
  usage
31
34
  exit 2
32
35
  fi
33
- PROJECT_DIR="$2"
36
+ PROJECT_ID="$2"
34
37
  shift 2
35
38
  ;;
39
+ --config)
40
+ if [ "$#" -lt 2 ]; then usage; exit 2; fi
41
+ CONFIG="$2"; shift 2 ;;
42
+ --output-dir)
43
+ if [ "$#" -lt 2 ]; then usage; exit 2; fi
44
+ OUTPUT_DIR="$2"; shift 2 ;;
45
+ --evidence)
46
+ if [ "$#" -lt 2 ]; then usage; exit 2; fi
47
+ EVIDENCE_PATH="$2"; shift 2 ;;
36
48
  *)
37
49
  echo "error: expected --build" >&2
38
50
  exit 2
@@ -40,9 +52,12 @@ while [ "$#" -gt 0 ]; do
40
52
  esac
41
53
  done
42
54
 
43
- if [ -z "$PROJECT_DIR" ]; then
44
- PROJECT_DIR="$("$PYTHON_BIN" "$HELPER" resolve --config "$CONFIG" --platform ios)"
45
- fi
55
+ if [ -z "$PROJECT_ID" ]; then PROJECT_ID="ios"; fi
56
+ PROJECT_DIR="$("$PYTHON_BIN" "$HELPER" resolve --config "$CONFIG" --platform ios --project "$PROJECT_ID")"
57
+ if [ -z "$OUTPUT_DIR" ]; then OUTPUT_DIR="$WORKSPACE_ROOT/$PROJECT_DIR/.supersdk/artifacts"; fi
58
+ if [ -z "$EVIDENCE_PATH" ]; then EVIDENCE_PATH="$WORKSPACE_ROOT/$PROJECT_DIR/.supersdk/evidence/ios-build-evidence.json"; fi
59
+
60
+ "$PYTHON_BIN" "$HELPER" inject --root "$WORKSPACE_ROOT" --config "$CONFIG" --platform ios --project "$PROJECT_ID"
46
61
 
47
62
  IOS_DIR="$WORKSPACE_ROOT/$PROJECT_DIR"
48
63
  GENERATED_DIR="$IOS_DIR/.supersdk/generated"
@@ -91,8 +106,7 @@ simple_config = generated_dir / "SimpleConfig.swift"
91
106
 
92
107
  if not managed_path.is_file():
93
108
  print(
94
- f"ios managed config missing; run scripts/supersdk_template.py inject --platform ios --project {project_dir} "
95
- "or ./super_build.sh --platform ios --build",
109
+ f"ios managed config missing for directory {project_dir}; run ./super_build.sh --project <projectId> --build",
96
110
  file=sys.stderr,
97
111
  )
98
112
  sys.exit(1)
@@ -297,3 +311,21 @@ xcodebuild \
297
311
  -destination "$SIMULATOR_DESTINATION" \
298
312
  CODE_SIGNING_ALLOWED=NO \
299
313
  test
314
+
315
+ mkdir -p "$OUTPUT_DIR" "$(dirname "$EVIDENCE_PATH")"
316
+ tar -cf "$OUTPUT_DIR/ios-simulator-build.tar" -C "$IOS_DIR" .supersdk/generated
317
+ "$PYTHON_BIN" - "$EVIDENCE_PATH" "$PROJECT_ID" "$PROJECT_DIR" "$SIMULATOR_DESTINATION" <<'PY'
318
+ import json
319
+ import sys
320
+ from pathlib import Path
321
+
322
+ path, project_id, project_dir, destination = sys.argv[1:]
323
+ Path(path).write_text(json.dumps({
324
+ "schemaVersion": 1,
325
+ "projectId": project_id,
326
+ "type": "ios",
327
+ "status": "success",
328
+ "projectDir": project_dir,
329
+ "destination": destination,
330
+ }, indent=2, sort_keys=True) + "\n", encoding="utf-8")
331
+ PY
@@ -0,0 +1,89 @@
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
+ OUTPUT_DIR=""
13
+ EVIDENCE_PATH=""
14
+
15
+ usage() { echo "Usage: scripts/build_service.sh --build --config PATH --project-id ID --output-dir DIR --evidence FILE" >&2; }
16
+ build_seen=false
17
+ while [ "$#" -gt 0 ]; do
18
+ case "$1" in
19
+ --build) if [ "$build_seen" = true ]; then usage; exit 2; fi; build_seen=true; shift ;;
20
+ --config) if [ "$#" -lt 2 ]; then usage; exit 2; fi; CONFIG="$2"; shift 2 ;;
21
+ --project-id) if [ "$#" -lt 2 ]; then usage; exit 2; fi; PROJECT_ID="$2"; shift 2 ;;
22
+ --output-dir) if [ "$#" -lt 2 ]; then usage; exit 2; fi; OUTPUT_DIR="$2"; shift 2 ;;
23
+ --evidence) if [ "$#" -lt 2 ]; then usage; exit 2; fi; EVIDENCE_PATH="$2"; shift 2 ;;
24
+ *) usage; exit 2 ;;
25
+ esac
26
+ done
27
+ if [ "$build_seen" = false ] || [ -z "$PROJECT_ID" ] || [ -z "$OUTPUT_DIR" ] || [ -z "$EVIDENCE_PATH" ]; then usage; exit 2; fi
28
+ if ! command -v docker >/dev/null 2>&1; then echo "Docker is required for service builds" >&2; exit 1; fi
29
+
30
+ project_json="$("$PYTHON_BIN" "$HELPER" validate --config "$CONFIG" --platform service --project "$PROJECT_ID")"
31
+ eval "$("$PYTHON_BIN" - "$project_json" <<'PY'
32
+ import json
33
+ import shlex
34
+ import sys
35
+
36
+ project = json.loads(sys.argv[1])["projects"][0]
37
+ build = project["platformConfig"]
38
+ for key, value in {
39
+ "PROJECT_DIR": project["dir"],
40
+ "BUILD_CONTEXT": build["context"],
41
+ "DOCKERFILE": build["dockerfile"],
42
+ "PLATFORM": build["platform"],
43
+ }.items():
44
+ print(f"{key}={shlex.quote(str(value))}")
45
+ print("BUILD_ARG_NAMES=" + shlex.quote("\n".join(build["argsFromEnv"])))
46
+ PY
47
+ )"
48
+
49
+ context_path="$WORKSPACE_ROOT/$PROJECT_DIR/$BUILD_CONTEXT"
50
+ dockerfile_path="$context_path/$DOCKERFILE"
51
+ if [ ! -f "$dockerfile_path" ] || [ -L "$dockerfile_path" ]; then echo "service Dockerfile must be a regular file inside build context" >&2; exit 1; fi
52
+ project_real="$(cd "$WORKSPACE_ROOT/$PROJECT_DIR" && pwd -P)"
53
+ context_real="$(cd "$context_path" && pwd -P)"
54
+ dockerfile_real="$(cd "$(dirname "$dockerfile_path")" && pwd -P)/$(basename "$dockerfile_path")"
55
+ case "$context_real/" in "$project_real/"*) ;; *) echo "service build context escapes project directory" >&2; exit 1 ;; esac
56
+ case "$dockerfile_real" in "$context_real/"*) ;; *) echo "service Dockerfile escapes build context" >&2; exit 1 ;; esac
57
+
58
+ tag="super-local/$PROJECT_ID:build-$(date +%s)-$$"
59
+ set --
60
+ while IFS= read -r name; do
61
+ [ -n "$name" ] || continue
62
+ eval "present=\${$name+x}"
63
+ if [ "$present" != x ]; then echo "service build input missing: $name" >&2; exit 1; fi
64
+ set -- "$@" --build-arg "$name"
65
+ done <<EOF
66
+ $BUILD_ARG_NAMES
67
+ EOF
68
+
69
+ docker build --platform "$PLATFORM" --file "$dockerfile_path" --tag "$tag" "$@" "$context_path"
70
+ image_id="$(docker image inspect --format '{{.Id}}' "$tag")"
71
+ mkdir -p "$OUTPUT_DIR" "$(dirname "$EVIDENCE_PATH")"
72
+ archive="$OUTPUT_DIR/image.tar"
73
+ docker save --output "$archive" "$tag"
74
+ "$PYTHON_BIN" - "$EVIDENCE_PATH" "$PROJECT_ID" "$tag" "$image_id" "$PLATFORM" <<'PY'
75
+ import json
76
+ import sys
77
+ from pathlib import Path
78
+
79
+ path, project_id, tag, image_id, platform = sys.argv[1:]
80
+ Path(path).write_text(json.dumps({
81
+ "schemaVersion": 1,
82
+ "projectId": project_id,
83
+ "type": "service",
84
+ "status": "success",
85
+ "localImageTag": tag,
86
+ "localImageId": image_id,
87
+ "platform": platform,
88
+ }, indent=2, sort_keys=True) + "\n", encoding="utf-8")
89
+ PY
@@ -7,37 +7,51 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
7
7
  WORKSPACE_ROOT="$(supersdk_require_workspace_root "$SCRIPT_DIR")"
8
8
  PYTHON_BIN="${PYTHON_BIN:-python3}"
9
9
  HELPER="$WORKSPACE_ROOT/scripts/supersdk_template.py"
10
- CONFIG="$WORKSPACE_ROOT/supersdk.json"
11
- PROJECT_DIR=""
10
+ CONFIG="$WORKSPACE_ROOT/super.json"
11
+ PROJECT_ID=""
12
+ OUTPUT_DIR=""
13
+ EVIDENCE_PATH=""
12
14
 
15
+ usage() { echo "Usage: scripts/build_site.sh --build --config PATH --project-id ID --output-dir DIR --evidence FILE" >&2; }
13
16
  build_seen=false
14
17
  while [ "$#" -gt 0 ]; do
15
18
  case "$1" in
16
- --build)
17
- if [ "$build_seen" = true ]; then
18
- echo "error: expected --build" >&2
19
- exit 2
20
- fi
21
- build_seen=true
22
- shift
23
- ;;
24
- --project)
25
- if [ "$#" -lt 2 ]; then
26
- echo "error: --project requires a value" >&2
27
- exit 2
28
- fi
29
- PROJECT_DIR="$2"
30
- shift 2
31
- ;;
32
- *)
33
- echo "error: expected --build" >&2
34
- exit 2
35
- ;;
19
+ --build) if [ "$build_seen" = true ]; then usage; exit 2; fi; build_seen=true; shift ;;
20
+ --config) if [ "$#" -lt 2 ]; then usage; exit 2; fi; CONFIG="$2"; shift 2 ;;
21
+ --project-id) if [ "$#" -lt 2 ]; then usage; exit 2; fi; PROJECT_ID="$2"; shift 2 ;;
22
+ --output-dir) if [ "$#" -lt 2 ]; then usage; exit 2; fi; OUTPUT_DIR="$2"; shift 2 ;;
23
+ --evidence) if [ "$#" -lt 2 ]; then usage; exit 2; fi; EVIDENCE_PATH="$2"; shift 2 ;;
24
+ *) usage; exit 2 ;;
36
25
  esac
37
26
  done
27
+ if [ "$build_seen" = false ]; then usage; exit 2; fi
28
+ if [ -z "$PROJECT_ID" ]; then PROJECT_ID="web"; fi
38
29
 
39
- if [ -z "$PROJECT_DIR" ]; then
40
- PROJECT_DIR="$("$PYTHON_BIN" "$HELPER" resolve --config "$CONFIG" --platform site)"
41
- fi
30
+ PROJECT_DIR="$("$PYTHON_BIN" "$HELPER" resolve --config "$CONFIG" --platform site --project "$PROJECT_ID")"
31
+ if [ -z "$OUTPUT_DIR" ]; then OUTPUT_DIR="$WORKSPACE_ROOT/$PROJECT_DIR/.supersdk/artifacts"; fi
32
+ if [ -z "$EVIDENCE_PATH" ]; then EVIDENCE_PATH="$WORKSPACE_ROOT/$PROJECT_DIR/.supersdk/evidence/site-build-evidence.json"; fi
33
+ "$PYTHON_BIN" "$HELPER" inject --root "$WORKSPACE_ROOT" --config "$CONFIG" --platform site --project "$PROJECT_ID"
34
+ package_json="$("$PYTHON_BIN" "$WORKSPACE_ROOT/scripts/web_package.py" package-managed --root "$WORKSPACE_ROOT" --project "$PROJECT_DIR")"
35
+ printf '%s\n' "$package_json"
36
+ mkdir -p "$OUTPUT_DIR" "$(dirname "$EVIDENCE_PATH")"
37
+ "$PYTHON_BIN" - "$package_json" "$OUTPUT_DIR" "$EVIDENCE_PATH" "$PROJECT_ID" "$PROJECT_DIR" <<'PY'
38
+ import json
39
+ import shutil
40
+ import sys
41
+ from pathlib import Path
42
42
 
43
- exec "$PYTHON_BIN" "$WORKSPACE_ROOT/scripts/web_package.py" package-managed --root "$WORKSPACE_ROOT" --project "$PROJECT_DIR"
43
+ result = json.loads(sys.argv[1])
44
+ output, evidence, project_id, project_dir = Path(sys.argv[2]), Path(sys.argv[3]), sys.argv[4], sys.argv[5]
45
+ shutil.copytree(Path(result["dist"]), output / "dist")
46
+ zip_path = result.get("zip")
47
+ if zip_path:
48
+ shutil.copy2(zip_path, output / Path(zip_path).name)
49
+ evidence.write_text(json.dumps({
50
+ "schemaVersion": 1,
51
+ "projectId": project_id,
52
+ "type": "site",
53
+ "status": "success",
54
+ "projectDir": project_dir,
55
+ "offline": {"host": result.get("host"), "skipped": bool(result.get("offline_skipped"))},
56
+ }, indent=2, sort_keys=True) + "\n", encoding="utf-8")
57
+ PY
@@ -1,18 +1,18 @@
1
1
  #!/usr/bin/env bash
2
2
  # 工作空间定位的单一实现,被 super_build.sh 与所有 build_<type>.sh 复用。
3
3
  #
4
- # 🔴 为什么不能再用 `APP_ROOT="$(dirname "$0")/.."`:项目目录由用户在 supersdk.json 的
4
+ # 🔴 为什么不能再用 `APP_ROOT="$(dirname "$0")/.."`:项目目录由用户在 super.json 的
5
5
  # `projects[].dir` 里指定,深度不定(`android`、`apps/android`、`clients/mobile/android`…)。
6
6
  # 任何「固定层级」的反推都会在第一个非默认布局上算错根目录,而且是**静默**算错 ——
7
7
  # 注入会写到一个不存在的地方,构建照样退出 0。
8
8
  #
9
- # 定位语义与 CLI 侧一致:向上查找 `supersdk.json`,它所在的目录就是工作空间根。
9
+ # 定位语义与 CLI 侧一致:向上查找 `super.json`,它所在的目录就是工作空间根。
10
10
  # `scripts/` 与 `super_build.sh` 是工作空间级共享物,所以脚本自身位置永远在根之下。
11
11
 
12
12
  supersdk_find_workspace_root() {
13
13
  dir="$1"
14
14
  while :; do
15
- if [ -f "$dir/supersdk.json" ]; then
15
+ if [ -f "$dir/super.json" ]; then
16
16
  printf '%s\n' "$dir"
17
17
  return 0
18
18
  fi
@@ -36,7 +36,7 @@ supersdk_workspace_root() {
36
36
  supersdk_require_workspace_root() {
37
37
  root="$(supersdk_workspace_root "$1" || true)"
38
38
  if [ -z "$root" ]; then
39
- echo "error: no supersdk.json found at or above $1; run this script from inside a SuperSDK workspace" >&2
39
+ echo "error: no super.json found at or above $1; run this script from inside a SuperSDK workspace" >&2
40
40
  exit 1
41
41
  fi
42
42
  printf '%s\n' "$root"
@@ -11,15 +11,13 @@ import supersdk_template
11
11
 
12
12
  def resolve_site_dir(root, project):
13
13
  """站点目录来自配置,不是写死的 `web/`。"""
14
- if project:
15
- return project
16
- return supersdk_template.resolve_single(Path(root) / supersdk_template.CONFIG_FILENAME, "site", None)
14
+ return supersdk_template.resolve_single(Path(root) / supersdk_template.CONFIG_FILENAME, "site", project)
17
15
 
18
16
 
19
17
  def main(argv=None):
20
18
  parser = argparse.ArgumentParser(description="Serve a SuperSDK site project for local HTTP debugging")
21
19
  parser.add_argument("--root", default=Path(__file__).resolve().parents[1], type=Path)
22
- parser.add_argument("--project", default=None, help="Site project directory; resolved from supersdk.json when omitted.")
20
+ parser.add_argument("--project", default=None, help="Stable site projectId; the directory is resolved from super.json.")
23
21
  parser.add_argument(
24
22
  "--host",
25
23
  default="127.0.0.1",