@supersdk/supercli 0.3.3 → 0.3.5-staging.52

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 (75) 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/domainEndpoints.js +142 -0
  20. package/dist/deploy/domainEndpoints.js.map +1 -0
  21. package/dist/deploy/manifest.js +189 -167
  22. package/dist/deploy/manifest.js.map +1 -1
  23. package/dist/deploy/preflight.js +15 -16
  24. package/dist/deploy/preflight.js.map +1 -1
  25. package/dist/deploy/resultWriter.js +95 -9
  26. package/dist/deploy/resultWriter.js.map +1 -1
  27. package/dist/deploy/runAdapter.js +79 -10
  28. package/dist/deploy/runAdapter.js.map +1 -1
  29. package/dist/deploy/siteAdapter.js +54 -8
  30. package/dist/deploy/siteAdapter.js.map +1 -1
  31. package/dist/docker/dockerCli.js +72 -77
  32. package/dist/docker/dockerCli.js.map +1 -1
  33. package/dist/publish/runClient.js +4 -0
  34. package/dist/publish/runClient.js.map +1 -1
  35. package/dist/template/README.md +26 -94
  36. package/dist/template/android/gradle/supersdk-config-reader.gradle +13 -62
  37. package/dist/template/android/scripts/build.sh +11 -0
  38. package/dist/template/ios/project.yml +1 -1
  39. package/dist/template/ios/scripts/build.sh +19 -0
  40. package/dist/template/ios/scripts/render_project.py +60 -0
  41. package/dist/template/ios/supersdk-default.config.json +6 -0
  42. package/dist/template/service/scripts/build.sh +11 -0
  43. package/dist/template/super.json +22 -14
  44. package/dist/template/template_manifest.json +3 -7
  45. package/dist/template/web/package.json +8 -0
  46. package/dist/template/web/scripts/build.sh +8 -0
  47. package/dist/template/web/scripts/web_package.py +490 -0
  48. package/dist/template/web/src/js/app.js +2 -2
  49. package/dist/util/shell.js +3 -3
  50. package/dist/workspace/config.js +3 -79
  51. package/dist/workspace/config.js.map +1 -1
  52. package/dist/workspace/identity.js +6 -15
  53. package/dist/workspace/identity.js.map +1 -1
  54. package/dist/workspace/projectIdentity.js +2 -7
  55. package/dist/workspace/projectIdentity.js.map +1 -1
  56. package/dist/workspace/template.js +205 -77
  57. package/dist/workspace/template.js.map +1 -1
  58. package/package.json +4 -1
  59. package/dist/commands/config.js +0 -170
  60. package/dist/commands/config.js.map +0 -1
  61. package/dist/template/scripts/android_snapshot_canary.py +0 -145
  62. package/dist/template/scripts/build_android.sh +0 -382
  63. package/dist/template/scripts/build_ios.sh +0 -331
  64. package/dist/template/scripts/build_service.sh +0 -89
  65. package/dist/template/scripts/build_site.sh +0 -57
  66. package/dist/template/scripts/lib/workspace.sh +0 -43
  67. package/dist/template/scripts/serve_web.py +0 -78
  68. package/dist/template/scripts/super_build_orchestrator.py +0 -344
  69. package/dist/template/scripts/supersdk_template.py +0 -1394
  70. package/dist/template/scripts/web_host_validator.py +0 -103
  71. package/dist/template/scripts/web_package.py +0 -296
  72. package/dist/template/scripts/ws03_shared_schema_merge_guard.py +0 -73
  73. package/dist/template/super_build.sh +0 -70
  74. package/dist/workspace/inspect.js +0 -275
  75. package/dist/workspace/inspect.js.map +0 -1
@@ -1,74 +1,25 @@
1
1
  import groovy.json.JsonSlurper
2
2
 
3
3
  def androidRoot = rootProject.projectDir
4
- def managedConfig = new File(androidRoot, ".supersdk/managed/config.json")
5
- def defaultConfig = new File(androidRoot, "supersdk-default.config.json")
6
- def configFile = managedConfig.isFile() ? managedConfig : defaultConfig
7
-
8
- // 🔴 走 fallback 必须出声。managed config 是 `./super_build.sh --build` 从根目录
9
- // super.json 投影出来的**当前**身份;supersdk-default.config.json 只是仓库里的一份
10
- // 快照,`--plan` 不会刷新它。静默使用快照意味着「改了 super.json 却装出旧身份的包」,
11
- // 而且构建照样 exit 0 —— 这类静默成功比直接失败危险得多。
12
- if (!managedConfig.isFile()) {
13
- logger.warn("SuperSDK: ${managedConfig} 不存在,回退使用 ${defaultConfig.name} 里的快照身份。" +
14
- "改过 super.json 的话请先跑 ./super_build.sh --build 重新投影,否则产物身份可能是旧的。")
15
- }
16
-
4
+ def configFile = new File(androidRoot, "supersdk-default.config.json")
17
5
  if (!configFile.isFile()) {
18
- throw new GradleException("SuperSDK Android config not found: ${managedConfig} or ${defaultConfig}")
6
+ throw new GradleException("Android project identity config missing: ${configFile}")
19
7
  }
20
-
21
8
  def config
22
- try {
23
- config = new JsonSlurper().parse(configFile)
24
- } catch (Exception exc) {
25
- throw new GradleException("SuperSDK Android config invalid at ${configFile}: ${exc.message}", exc)
26
- }
27
-
9
+ try { config = new JsonSlurper().parse(configFile) }
10
+ catch (Exception exc) { throw new GradleException("Android project build config invalid: ${exc.message}", exc) }
28
11
  def requireString = { value, name ->
29
- if (!(value instanceof String) || value.trim().isEmpty()) {
30
- throw new GradleException("SuperSDK Android config invalid at ${configFile}: ${name} must be a non-empty string")
31
- }
12
+ if (!(value instanceof String) || value.trim().isEmpty()) throw new GradleException("${name} must be a non-empty string")
32
13
  value
33
14
  }
34
-
35
- def requireMatchingString = { value, name, pattern, message ->
36
- def result = requireString(value, name)
37
- if (!(result ==~ pattern)) {
38
- throw new GradleException("SuperSDK Android config invalid at ${configFile}: ${name} ${message}")
39
- }
40
- result
41
- }
42
-
43
- def version = config.version instanceof Map ? config.version : [:]
44
- def platformConfig = config.platform_config instanceof Map ? config.platform_config : [:]
45
- def sdk = config.sdk instanceof Map ? config.sdk : [:]
46
- if (config.managed_by != "supersdk-template") {
47
- throw new GradleException("SuperSDK Android config invalid at ${configFile}: managed_by must be supersdk-template")
48
- }
49
- if (config.schema_version != 4) {
50
- throw new GradleException("SuperSDK Android config invalid at ${configFile}: schema_version must be 4")
51
- }
52
- def versionCodeValue = version.code
53
- if (!(versionCodeValue instanceof Number)) {
54
- throw new GradleException("SuperSDK Android config invalid at ${configFile}: version.code must be a positive 32-bit integer")
55
- }
56
- def versionCodeDecimal = new BigDecimal(versionCodeValue.toString())
57
- if (versionCodeDecimal.scale() > 0 || versionCodeDecimal < BigDecimal.ONE || versionCodeDecimal > new BigDecimal("2147483647")) {
58
- throw new GradleException("SuperSDK Android config invalid at ${configFile}: version.code must be a positive 32-bit integer")
59
- }
60
-
61
15
  ext.supersdkAndroidConfigPath = configFile.absolutePath
62
- ext.supersdkProjectId = requireMatchingString(config.project_id, "project_id", /[a-z0-9][a-z0-9-]{0,62}/, 'must match ^[a-z0-9][a-z0-9-]{0,62}$')
63
- ext.supersdkSpid = requireMatchingString(config.spid, "spid", /[a-z0-9]{8}/, 'must match ^[a-z0-9]{8}$')
64
- // 🔴 这里**没有** environment。它是 SuperSDK.init 的运行时参数,编译期不需要,
65
- // 也就不该进 BuildConfig —— 一旦编进产物,换环境就等于重新打包。
66
- // demo 在运行时切(见 EnvironmentStore.java)。
16
+ def explicitSpid = project.findProperty("supersdkSpid")
17
+ ext.supersdkSpid = requireString(explicitSpid ?: config.spid, "spid")
67
18
  ext.supersdkAppName = requireString(config.name, "name")
68
- if ((ext.supersdkAppName =~ /[\x00-\x1F]/).find() || ext.supersdkAppName != ext.supersdkAppName.trim()) {
69
- throw new GradleException("SuperSDK Android config invalid at ${configFile}: name must be a non-empty Android app label without control characters or edge whitespace")
70
- }
71
- ext.supersdkApplicationId = requireMatchingString(platformConfig.package, "platform_config.package", /[A-Za-z][A-Za-z0-9_]*(\.[A-Za-z][A-Za-z0-9_]*)+/, "must be a Java package")
19
+ def platformConfig = config.platform_config instanceof Map ? config.platform_config : [:]
20
+ def version = config.version instanceof Map ? config.version : [:]
21
+ def sdk = config.sdk instanceof Map ? config.sdk : [:]
22
+ ext.supersdkApplicationId = requireString(platformConfig.package, "platform_config.package")
72
23
  ext.supersdkVersionName = requireString(version.name, "version.name")
73
- ext.supersdkVersionCode = versionCodeDecimal.intValueExact()
74
- ext.supersdkAndroidVersion = requireMatchingString(sdk.androidVersion, "sdk.androidVersion", /[0-9]+\.[0-9]+\.[0-9]+(?:[-.][A-Za-z0-9]+)*/, 'must match ^[0-9]+\\.[0-9]+\\.[0-9]+(?:[-.][A-Za-z0-9]+)*$')
24
+ ext.supersdkVersionCode = (version.code as Number).intValue()
25
+ ext.supersdkAndroidVersion = requireString(sdk.androidVersion, "sdk.androidVersion")
@@ -0,0 +1,11 @@
1
+ #!/usr/bin/env bash
2
+ set -euo pipefail
3
+ spid=''
4
+ for arg in "$@"; do case "$arg" in --spid=*) spid="${arg#--spid=}";; esac; done
5
+ [ -n "$spid" ] || { echo 'build requires --spid=' >&2; exit 2; }
6
+ printf '%s' "$spid" | grep -Eq '^[a-z0-9]{8}$' || { echo 'spid must be 8 lowercase letters or digits' >&2; exit 2; }
7
+ ./gradlew -PsupersdkSpid="$spid" :app:assembleDebug
8
+ apk="app/build/outputs/apk/debug/app-debug.apk"
9
+ [ -f "$apk" ] || { echo "Android build did not produce $apk" >&2; exit 1; }
10
+ mkdir -p .supersdk/artifacts
11
+ cp "$apk" .supersdk/artifacts/app-debug.apk
@@ -6,7 +6,7 @@ settings:
6
6
  SWIFT_VERSION: "5.9"
7
7
  packages:
8
8
  SuperSDK:
9
- path: __SUPERSDK_MOCK_PACKAGE_PATH__
9
+ __SUPERSDK_PACKAGE_SOURCE__
10
10
  targets:
11
11
  SimpleApp:
12
12
  type: application
@@ -0,0 +1,19 @@
1
+ #!/usr/bin/env bash
2
+ set -euo pipefail
3
+ spid=''
4
+ for arg in "$@"; do case "$arg" in --spid=*) spid="${arg#--spid=}";; esac; done
5
+ [ -n "$spid" ] || { echo 'build requires --spid=' >&2; exit 2; }
6
+ printf '%s' "$spid" | grep -Eq '^[a-z0-9]{8}$' || { echo 'spid must be 8 lowercase letters or digits' >&2; exit 2; }
7
+ if ! command -v xcodebuild >/dev/null 2>&1; then
8
+ echo 'SKIP_XCODEBUILD_MISSING: install Xcode to build the iOS template' >&2
9
+ exit 1
10
+ fi
11
+ mkdir -p .supersdk/artifacts
12
+ if ! command -v xcodegen >/dev/null 2>&1; then
13
+ echo 'XCODEGEN_MISSING: install xcodegen to generate the iOS project' >&2
14
+ exit 1
15
+ fi
16
+ python3 scripts/render_project.py "$spid"
17
+ xcodegen generate --spec build/project.yml --project build/SimpleApp.xcodeproj
18
+ xcodebuild -project build/SimpleApp.xcodeproj -scheme SimpleApp -configuration Debug -derivedDataPath build build
19
+ tar -cf .supersdk/artifacts/ios-simulator-build.tar -C build .
@@ -0,0 +1,60 @@
1
+ #!/usr/bin/env python3
2
+ import json
3
+ import re
4
+ import sys
5
+ from pathlib import Path
6
+ from urllib.parse import urlparse
7
+
8
+ root = Path(__file__).resolve().parents[1]
9
+ spid = sys.argv[1]
10
+ if not re.fullmatch(r"[a-z0-9]{8}", spid):
11
+ raise SystemExit("spid must be 8 lowercase letters or digits")
12
+ identity = json.loads((root / "supersdk-default.config.json").read_text())
13
+ name = identity["name"]
14
+ bundle = identity["bundleId"]
15
+ version = identity["version"]
16
+ spm_mode = identity["spmMode"]
17
+ if spm_mode == "mock":
18
+ package_source = f'path: {json.dumps(str(root / "MockSuperSDKPackage"))}'
19
+ elif spm_mode == "real":
20
+ package_url = identity.get("iosPackageUrl")
21
+ package_version = identity.get("iosVersion")
22
+ parsed_url = urlparse(package_url) if isinstance(package_url, str) else None
23
+ package_host = (parsed_url.hostname or "").lower() if parsed_url else ""
24
+ if (
25
+ parsed_url is None
26
+ or parsed_url.scheme != "https"
27
+ or not package_host
28
+ or package_host == "localhost"
29
+ or package_host.endswith(".local")
30
+ or "example." in package_host
31
+ or parsed_url.path in ("", "/")
32
+ ):
33
+ raise SystemExit("spmMode real requires a non-placeholder HTTPS iosPackageUrl")
34
+ if not isinstance(package_version, str) or not re.fullmatch(r"[0-9]+\.[0-9]+\.[0-9]+(?:-[0-9A-Za-z.-]+)?", package_version):
35
+ raise SystemExit("spmMode real requires a semantic iosVersion")
36
+ package_source = f'url: {json.dumps(package_url)}\n from: {json.dumps(package_version)}'
37
+ else:
38
+ raise SystemExit("spmMode must be mock or real")
39
+ build = root / "build"
40
+ generated = build / "generated"
41
+ generated.mkdir(parents=True, exist_ok=True)
42
+ (generated / "SimpleConfig.swift").write_text(
43
+ f"import Foundation\nenum SimpleConfig {{ static let spid = {json.dumps(spid)} }}\n"
44
+ )
45
+ replacements = {
46
+ "__SUPERSDK_APP_SOURCES_PATH__": str(root / "Sources/App"),
47
+ "__SUPERSDK_SIMPLE_CONFIG_PATH__": str(generated / "SimpleConfig.swift"),
48
+ "__SUPERSDK_RESOURCES_PATH__": str(root / "Resources"),
49
+ "__SUPERSDK_BUNDLE_ID__": bundle,
50
+ "__SUPERSDK_VERSION_NAME__": str(version["name"]),
51
+ "__SUPERSDK_VERSION_CODE__": str(version["code"]),
52
+ "__SUPERSDK_INFOPLIST_PATH__": str(root / "Resources/Info.plist"),
53
+ "__SUPERSDK_DISPLAY_NAME__": name,
54
+ "__SUPERSDK_TEST_SOURCES_PATH__": str(root / "Tests/SimpleAppTests"),
55
+ }
56
+ template = (root / "project.yml").read_text()
57
+ template = template.replace("__SUPERSDK_PACKAGE_SOURCE__", package_source)
58
+ for token, value in replacements.items():
59
+ template = template.replace(token, json.dumps(value))
60
+ (build / "project.yml").write_text(template)
@@ -0,0 +1,6 @@
1
+ {
2
+ "name": "SuperSDK Simple",
3
+ "bundleId": "com.supersdk.simple",
4
+ "spmMode": "mock",
5
+ "version": {"name": "1.0.0", "code": 1}
6
+ }
@@ -0,0 +1,11 @@
1
+ #!/usr/bin/env bash
2
+ set -euo pipefail
3
+ spid=''
4
+ for arg in "$@"; do case "$arg" in --spid=*) spid="${arg#--spid=}";; esac; done
5
+ [ -n "$spid" ] || { echo 'build requires --spid=' >&2; exit 2; }
6
+ printf '%s' "$spid" | grep -Eq '^[a-z0-9]{8}$' || { echo 'spid must be 8 lowercase letters or digits' >&2; exit 2; }
7
+ command -v docker >/dev/null 2>&1 || { echo 'Docker is required for service builds' >&2; exit 1; }
8
+ mkdir -p .supersdk/artifacts
9
+ tag="super-local/${spid}:build"
10
+ docker build --platform linux/amd64 --file Dockerfile --tag "$tag" .
11
+ docker save --output .supersdk/artifacts/image.tar "$tag"
@@ -1,21 +1,23 @@
1
1
  {
2
- "schemaVersion": 4,
2
+ "schemaVersion": 5,
3
3
  "spid": "demo0001",
4
4
  "name": "SuperSDK Simple",
5
5
  "version": {
6
6
  "name": "1.0.0",
7
7
  "code": 1
8
8
  },
9
- "sdk": {
10
- "androidVersion": "1.0.0.57-SNAPSHOT"
11
- },
12
9
  "projects": [
13
10
  {
14
11
  "projectId": "android",
15
12
  "type": "android",
16
13
  "dir": "android",
17
14
  "name": "SuperSDK Simple",
18
- "package": "com.supersdk.simple.host"
15
+ "package": "com.supersdk.simple.host",
16
+ "build": {
17
+ "entry": "scripts/build.sh",
18
+ "args": ["--spid=${spid}"],
19
+ "artifacts": [{"id": "android-apk", "kind": "file", "path": ".supersdk/artifacts/app-debug.apk"}]
20
+ }
19
21
  },
20
22
  {
21
23
  "projectId": "ios",
@@ -23,7 +25,12 @@
23
25
  "dir": "ios",
24
26
  "name": "SuperSDK Simple",
25
27
  "bundleId": "com.supersdk.simple",
26
- "spmMode": "mock"
28
+ "spmMode": "mock",
29
+ "build": {
30
+ "entry": "scripts/build.sh",
31
+ "args": ["--spid=${spid}"],
32
+ "artifacts": [{"id": "ios-simulator-build", "kind": "file", "path": ".supersdk/artifacts/ios-simulator-build.tar"}]
33
+ }
27
34
  },
28
35
  {
29
36
  "projectId": "web",
@@ -31,10 +38,12 @@
31
38
  "dir": "web",
32
39
  "name": "SuperSDK Simple Web",
33
40
  "build": {
34
- "outputDir": "dist"
35
- },
36
- "offline": {
37
- "host": "simple.supersdk.com"
41
+ "entry": "scripts/build.sh",
42
+ "args": ["--spid=${spid}"],
43
+ "artifacts": [
44
+ {"id": "site-dist", "kind": "directory", "path": "dist"},
45
+ {"id": "site-offline-zip", "kind": "file", "path": ".supersdk/artifacts/site-offline.zip"}
46
+ ]
38
47
  }
39
48
  },
40
49
  {
@@ -43,10 +52,9 @@
43
52
  "dir": "service",
44
53
  "name": "SuperSDK Simple Service",
45
54
  "build": {
46
- "context": ".",
47
- "dockerfile": "Dockerfile",
48
- "platform": "linux/amd64",
49
- "argsFromEnv": []
55
+ "entry": "scripts/build.sh",
56
+ "args": ["--spid=${spid}"],
57
+ "artifacts": [{"id": "service-image", "kind": "docker-image-archive", "path": ".supersdk/artifacts/image.tar"}]
50
58
  },
51
59
  "deploy": []
52
60
  }
@@ -1,16 +1,12 @@
1
1
  {
2
- "engineVersion": "4.0.0",
3
- "schemaVersion": 4,
2
+ "schemaVersion": 5,
4
3
  "source": "app_repo_example",
5
4
  "comment": [
6
- "模板的拆分契约,给 supercli 消费:`init` 落地 workspace 级共享物一次,`add <type> <dir>` 拷贝对应类型的项目模板。",
7
- "workspace: 工作空间级共享物(super_build.sh 与 scripts/ 是所有项目共用的编排与引擎)。",
8
- "projects: 类型 -> app_repo_example 里该类型的项目模板目录。目标目录由用户在 `add` 时指定,不必与这里同名。",
5
+ "模板的拆分契约,给 supercli 消费:`init` 只落地 workspace README 与忽略文件,`add <type> <dir>` 拷贝对应类型的项目模板。",
6
+ "每个项目自带 scripts/build.sh,构建参数和产物声明位于 super.json 对应项目的 build 段;Web 的 package.json 与 scripts/web_package.py 也随项目模板复制。",
9
7
  "generated: 不是拷贝来的,而是 `supercli init` 按 spid 生成的。"
10
8
  ],
11
9
  "workspace": [
12
- "super_build.sh",
13
- "scripts",
14
10
  "README.md",
15
11
  ".gitignore"
16
12
  ],
@@ -0,0 +1,8 @@
1
+ {
2
+ "name": "supersdk-simple-web",
3
+ "private": true,
4
+ "version": "1.0.0",
5
+ "supersdk": {
6
+ "offlineHost": "simple.supersdk.com"
7
+ }
8
+ }
@@ -0,0 +1,8 @@
1
+ #!/usr/bin/env bash
2
+ set -euo pipefail
3
+ spid=''
4
+ for arg in "$@"; do case "$arg" in --spid=*) spid="${arg#--spid=}";; esac; done
5
+ [ -n "$spid" ] || { echo 'build requires --spid=' >&2; exit 2; }
6
+ printf '%s' "$spid" | grep -Eq '^[a-z0-9]{8}$' || { echo 'spid must be 8 lowercase letters or digits' >&2; exit 2; }
7
+ SCRIPT_DIR="$(CDPATH= cd "$(dirname "$0")" && pwd)"
8
+ python3 "$SCRIPT_DIR/web_package.py" build --spid "$spid"