@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.
Files changed (93) hide show
  1. package/dist/cli.js +11 -22
  2. package/dist/cli.js.map +1 -1
  3. package/dist/commands/add.js +31 -79
  4. package/dist/commands/add.js.map +1 -1
  5. package/dist/commands/analytics.js +9 -15
  6. package/dist/commands/analytics.js.map +1 -1
  7. package/dist/commands/db.js +19 -24
  8. package/dist/commands/db.js.map +1 -1
  9. package/dist/commands/deploy.js +751 -434
  10. package/dist/commands/deploy.js.map +1 -1
  11. package/dist/commands/env.js +8 -8
  12. package/dist/commands/env.js.map +1 -1
  13. package/dist/commands/image.js +20 -31
  14. package/dist/commands/image.js.map +1 -1
  15. package/dist/commands/init.js +37 -68
  16. package/dist/commands/init.js.map +1 -1
  17. package/dist/commands/logs.js +7 -16
  18. package/dist/commands/logs.js.map +1 -1
  19. package/dist/commands/publishSite.js +943 -28
  20. package/dist/commands/publishSite.js.map +1 -1
  21. package/dist/commands/register.js +30 -51
  22. package/dist/commands/register.js.map +1 -1
  23. package/dist/commands/settings.js +6 -10
  24. package/dist/commands/settings.js.map +1 -1
  25. package/dist/config/appConfig.js +36 -40
  26. package/dist/config/appConfig.js.map +1 -1
  27. package/dist/docker/dockerCli.js +1 -63
  28. package/dist/docker/dockerCli.js.map +1 -1
  29. package/dist/output/envelope.js +1 -5
  30. package/dist/output/envelope.js.map +1 -1
  31. package/dist/output/resultPrinter.js +0 -3
  32. package/dist/output/resultPrinter.js.map +1 -1
  33. package/dist/publish/responseClassifier.js +4 -4
  34. package/dist/publish/responseClassifier.js.map +1 -1
  35. package/dist/publish/runClient.js +11 -11
  36. package/dist/publish/runClient.js.map +1 -1
  37. package/dist/publish/siteConfig.js +649 -0
  38. package/dist/publish/siteConfig.js.map +1 -0
  39. package/dist/publish/siteZip.js +5 -4
  40. package/dist/publish/siteZip.js.map +1 -1
  41. package/dist/template/README.md +227 -64
  42. package/dist/template/android/app/src/main/java/com/supersdk/simple/EnvironmentStore.java +1 -1
  43. package/dist/template/android/app/src/main/java/com/supersdk/simple/SimpleApplication.java +2 -2
  44. package/dist/template/android/gradle/supersdk-config-reader.gradle +5 -6
  45. package/dist/template/android/supersdk-default.config.json +2 -3
  46. package/dist/template/ios/Sources/App/AppDelegate.swift +1 -1
  47. package/dist/template/ios/Sources/App/SimpleSDKBootstrap.swift +1 -1
  48. package/dist/template/scripts/build_android.sh +10 -26
  49. package/dist/template/scripts/build_ios.sh +9 -41
  50. package/dist/template/scripts/build_site.sh +26 -40
  51. package/dist/template/scripts/lib/workspace.sh +4 -4
  52. package/dist/template/scripts/serve_web.py +4 -2
  53. package/dist/template/scripts/super_build_orchestrator.py +355 -278
  54. package/dist/template/scripts/supersdk_template.py +181 -414
  55. package/dist/template/scripts/web_package.py +8 -9
  56. package/dist/template/super_build.sh +113 -39
  57. package/dist/template/{super.json → supersdk.json} +1 -20
  58. package/dist/template/template_manifest.json +4 -5
  59. package/dist/workspace/config.js +119 -81
  60. package/dist/workspace/config.js.map +1 -1
  61. package/dist/workspace/identity.js +14 -15
  62. package/dist/workspace/identity.js.map +1 -1
  63. package/dist/workspace/inspect.js +0 -1
  64. package/dist/workspace/inspect.js.map +1 -1
  65. package/dist/workspace/projectIdentity.js +96 -53
  66. package/dist/workspace/projectIdentity.js.map +1 -1
  67. package/dist/workspace/template.js +8 -5
  68. package/dist/workspace/template.js.map +1 -1
  69. package/package.json +2 -2
  70. package/dist/build/artifactIntegrity.js +0 -119
  71. package/dist/build/artifactIntegrity.js.map +0 -1
  72. package/dist/commands/build.js +0 -231
  73. package/dist/commands/build.js.map +0 -1
  74. package/dist/commands/config.js +0 -170
  75. package/dist/commands/config.js.map +0 -1
  76. package/dist/config/superConfig.js +0 -429
  77. package/dist/config/superConfig.js.map +0 -1
  78. package/dist/deploy/adapterTypes.js +0 -3
  79. package/dist/deploy/adapterTypes.js.map +0 -1
  80. package/dist/deploy/manifest.js +0 -381
  81. package/dist/deploy/manifest.js.map +0 -1
  82. package/dist/deploy/preflight.js +0 -202
  83. package/dist/deploy/preflight.js.map +0 -1
  84. package/dist/deploy/resultWriter.js +0 -178
  85. package/dist/deploy/resultWriter.js.map +0 -1
  86. package/dist/deploy/runAdapter.js +0 -299
  87. package/dist/deploy/runAdapter.js.map +0 -1
  88. package/dist/deploy/siteAdapter.js +0 -182
  89. package/dist/deploy/siteAdapter.js.map +0 -1
  90. package/dist/template/scripts/build_service.sh +0 -89
  91. package/dist/template/service/Dockerfile +0 -2
  92. package/dist/workspace/projectContext.js +0 -93
  93. package/dist/workspace/projectContext.js.map +0 -1
@@ -0,0 +1 @@
1
+ {"version":3,"file":"siteConfig.js","sourceRoot":"","sources":["../../src/publish/siteConfig.ts"],"names":[],"mappings":"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"}
@@ -42,14 +42,15 @@ exports.buildSiteZip = buildSiteZip;
42
42
  //
43
43
  // Rules:
44
44
  // - REQUIRE a root index.html (else a local error, no upload).
45
- // - exclude the root super.json (the workspace config) + dotfiles/dotdirs, but KEEP
45
+ // - exclude the root supersdk.json (SITE_CONFIG_FILENAME — the retired
46
+ // super-site.yml is no longer a thing) + dotfiles/dotdirs, but KEEP
46
47
  // .well-known/.
47
48
  // - reject symlinks + path traversal + case-insensitive duplicate paths.
48
49
  // - per-entry <= 25 MiB, file count <= 2000, compressed archive <= 50 MiB.
49
50
  const fs = __importStar(require("node:fs"));
50
51
  const path = __importStar(require("node:path"));
51
52
  const yazl = __importStar(require("yazl"));
52
- const appConfig_1 = require("../config/appConfig");
53
+ const siteConfig_1 = require("./siteConfig");
53
54
  const MiB = 1024 * 1024;
54
55
  exports.DEFAULT_ZIP_LIMITS = {
55
56
  maxFileBytes: 25 * MiB,
@@ -88,11 +89,11 @@ function collectEntries(root, limits) {
88
89
  if (name === '..' || name === '.' || name.includes('\\') || name.includes('/')) {
89
90
  throw new ZipBuildError('PATH_TRAVERSAL', `illegal path entry: ${rel}`);
90
91
  }
91
- // Exclusions: root super.json + dotfiles/dotdirs (keep .well-known/).
92
+ // Exclusions: root supersdk.json + dotfiles/dotdirs (keep .well-known/).
92
93
  // The root config carries spid/orgId — packaging it would publish the
93
94
  // project's identity to a public site whenever the publish dir IS the
94
95
  // repo root (single-page site repos).
95
- if (relPrefix === '' && name === appConfig_1.APP_CONFIG_FILENAME)
96
+ if (relPrefix === '' && name === siteConfig_1.SITE_CONFIG_FILENAME)
96
97
  continue;
97
98
  if (isExcludedSegment(name))
98
99
  continue;
@@ -1 +1 @@
1
- {"version":3,"file":"siteZip.js","sourceRoot":"","sources":["../../src/publish/siteZip.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyIA,oCA2DC;AApMD,iFAAiF;AACjF,+EAA+E;AAC/E,8EAA8E;AAC9E,uDAAuD;AACvD,EAAE;AACF,SAAS;AACT,iEAAiE;AACjE,sFAAsF;AACtF,oBAAoB;AACpB,2EAA2E;AAC3E,6EAA6E;AAC7E,4CAA8B;AAC9B,gDAAkC;AAClC,2CAA6B;AAC7B,mDAA0D;AAE1D,MAAM,GAAG,GAAG,IAAI,GAAG,IAAI,CAAC;AAUX,QAAA,kBAAkB,GAAc;IAC3C,YAAY,EAAE,EAAE,GAAG,GAAG;IACtB,YAAY,EAAE,IAAI;IAClB,eAAe,EAAE,EAAE,GAAG,GAAG;IACzB,oBAAoB,EAAE,GAAG,GAAG,GAAG;CAChC,CAAC;AAYF,MAAa,aAAc,SAAQ,KAAK;IAE3B;IADX,YACW,IAAkB,EAC3B,OAAe;QAEf,KAAK,CAAC,OAAO,CAAC,CAAC;QAHN,SAAI,GAAJ,IAAI,CAAc;QAI3B,IAAI,CAAC,IAAI,GAAG,eAAe,CAAC;IAC9B,CAAC;CACF;AARD,sCAQC;AAgBD,qFAAqF;AACrF,SAAS,iBAAiB,CAAC,OAAe;IACxC,OAAO,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,OAAO,KAAK,aAAa,CAAC;AAC9D,CAAC;AAED,SAAS,cAAc,CAAC,IAAY,EAAE,MAAiB;IACrD,MAAM,OAAO,GAAY,EAAE,CAAC;IAC5B,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;IAEtC,MAAM,IAAI,GAAG,CAAC,MAAc,EAAE,SAAiB,EAAQ,EAAE;QACvD,MAAM,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QAChE,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;YACzB,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YACpC,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YAEtD,sDAAsD;YACtD,IAAI,MAAM,CAAC,cAAc,EAAE,EAAE,CAAC;gBAC5B,MAAM,IAAI,aAAa,CAAC,SAAS,EAAE,oCAAoC,GAAG,EAAE,CAAC,CAAC;YAChF,CAAC;YACD,yEAAyE;YACzE,qEAAqE;YACrE,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC/E,MAAM,IAAI,aAAa,CAAC,gBAAgB,EAAE,uBAAuB,GAAG,EAAE,CAAC,CAAC;YAC1E,CAAC;YAED,sEAAsE;YACtE,sEAAsE;YACtE,sEAAsE;YACtE,sCAAsC;YACtC,IAAI,SAAS,KAAK,EAAE,IAAI,IAAI,KAAK,+BAAmB;gBAAE,SAAS;YAC/D,IAAI,iBAAiB,CAAC,IAAI,CAAC;gBAAE,SAAS;YAEtC,IAAI,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;gBACzB,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACf,SAAS;YACX,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBAAE,SAAS,CAAC,0BAA0B;YAE1D,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YAC9B,IAAI,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,YAAY,EAAE,CAAC;gBACpC,MAAM,IAAI,aAAa,CACrB,gBAAgB,EAChB,GAAG,GAAG,sCAAsC,IAAI,CAAC,IAAI,QAAQ,CAC9D,CAAC;YACJ,CAAC;YACD,MAAM,MAAM,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;YACjC,IAAI,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC5B,MAAM,IAAI,aAAa,CAAC,eAAe,EAAE,0CAA0C,GAAG,EAAE,CAAC,CAAC;YAC5F,CAAC;YACD,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACxB,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC,CAAC;IAEF,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAEf,IAAI,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC,YAAY,EAAE,CAAC;QACzC,MAAM,IAAI,aAAa,CACrB,qBAAqB,EACrB,GAAG,OAAO,CAAC,MAAM,qCAAqC,CACvD,CAAC;IACJ,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,YAAY,CAAC,GAAW,EAAE,cAAmC;IACjF,MAAM,MAAM,GAAc,EAAE,GAAG,0BAAkB,EAAE,GAAG,cAAc,EAAE,CAAC;IAEvE,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAE5C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,YAAY,CAAC,EAAE,CAAC;QACjD,MAAM,IAAI,aAAa,CAAC,oBAAoB,EAAE,mEAAmE,CAAC,CAAC;IACrH,CAAC;IAED,8EAA8E;IAC9E,+EAA+E;IAC/E,4CAA4C;IAC5C,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC/D,IAAI,UAAU,GAAG,MAAM,CAAC,oBAAoB,EAAE,CAAC;QAC7C,MAAM,IAAI,aAAa,CACrB,wBAAwB,EACxB,yBAAyB,UAAU,iCAAiC,CACrE,CAAC;IACJ,CAAC;IAED,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;IAC/B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;IACD,GAAG,CAAC,GAAG,EAAE,CAAC;IAEV,6EAA6E;IAC7E,6EAA6E;IAC7E,uEAAuE;IACvE,MAAM,MAAM,GAAW,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3D,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,MAAM,MAAM,GAAG,GAAG,CAAC,YAA2E,CAAC;QAC/F,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;YAClC,IAAI,OAAO;gBAAE,OAAO;YACpB,WAAW,IAAI,KAAK,CAAC,MAAM,CAAC;YAC5B,IAAI,WAAW,GAAG,MAAM,CAAC,eAAe,EAAE,CAAC;gBACzC,OAAO,GAAG,IAAI,CAAC;gBACf,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;gBACnB,MAAM,CACJ,IAAI,aAAa,CACf,mBAAmB,EACnB,gDAAgD,WAAW,QAAQ,CACpE,CACF,CAAC;gBACF,OAAO;YACT,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAU,EAAE,EAAE;YAChC,IAAI,CAAC,OAAO;gBAAE,MAAM,CAAC,GAAG,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;YACpB,IAAI,CAAC,OAAO;gBAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;AAC7F,CAAC"}
1
+ {"version":3,"file":"siteZip.js","sourceRoot":"","sources":["../../src/publish/siteZip.ts"],"names":[],"mappings":"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"}
@@ -1,100 +1,263 @@
1
- # SuperSDK multi-project template
1
+ # SuperSDK Workspace Template
2
2
 
3
- This directory is a copy-and-go workspace template. `super.json` schema v4 is the
4
- single source of truth for one platform project (`spid`) and any number of local
5
- modules identified by stable `projectId` values.
3
+ This directory is the copy-ready `app_repo_example` template scaffold for a SuperSDK
4
+ workspace. One workspace = one `spid`. The directory holding `supersdk.json` is the
5
+ workspace root; every project listed in `projects[]` lives in a subdirectory of it.
6
6
 
7
- ## Configuration
7
+ Edit one root `supersdk.json`, run plan or build from the workspace root, and use the
8
+ root ordered summary to inspect project results.
8
9
 
9
- The default authority is `<workspace>/super.json`. An alternative product config
10
- must be selected explicitly with `--config`; helpers never fall back after an
11
- explicit path fails. The retired `supersdk.json` is not read alongside v4.
10
+ Platform status: BL-002 provides the Android Maven host, BL-003 provides the iOS
11
+ SPM/mock host, BL-004 provides the Web/JSSDK host, and BL-005 connects them
12
+ through the root build orchestration described below.
12
13
 
13
- Each project has:
14
+ ## Layout
14
15
 
15
- - `projectId`: stable local selector used by `--project`;
16
- - `type`: one of `android`, `ios`, `site`, or `service`;
17
- - `dir`: relative project source directory;
18
- - platform identity/build fields;
19
- - for `site` and `service`, optional named `deploy[]` targets selected later by
20
- SuperCLI using `envTarget`.
16
+ Workspace-level (shared by every project, laid down once by `supercli init`):
21
17
 
22
- Configuration is strict JSON. Duplicate keys, `NaN`/`Infinity`, aliases, unknown
23
- fields, absolute/traversing paths, overlapping project directories, duplicate
24
- project IDs, and duplicate `(slug, env)` deployment identities fail closed.
18
+ - `supersdk.json` — the single source of truth for this workspace
19
+ - `super_build.sh` — root orchestration entry point
20
+ - `scripts/` — the config engine and the per-type build helpers
21
+ - `output/` — offline packages, one subdirectory per site project
25
22
 
26
- Secrets and runtime values never belong in `super.json`. Service build arguments
27
- and deployment variables store environment-variable names only. Docker build args
28
- are not a secret channel because image history may retain them.
23
+ Per-project (copied by `supercli add <type> <dir>`):
29
24
 
30
- ## Build
25
+ - `android/` — Android host, type `android`
26
+ - `ios/` — iOS host, type `ios`
27
+ - `web/` — Web/site host, type `site`
31
28
 
32
- Plan all configured projects:
29
+ The directory names above are only defaults. `projects[].dir` may be any relative
30
+ path, at any depth (`apps/android`, `clients/mobile/ios`, …). Nothing in the build
31
+ scripts assumes a fixed nesting level: they locate the workspace root by searching
32
+ upwards for `supersdk.json`, exactly like the CLI does.
33
+
34
+ ## Maintainer Flow
33
35
 
34
36
  ```bash
35
37
  ./super_build.sh --plan
38
+ ./super_build.sh --build
39
+ ./super_build.sh --platform site --build
40
+ ./super_build.sh --project web --build
36
41
  ```
37
42
 
38
- Build all projects to a new portable directory:
43
+ No arguments are equivalent to `./super_build.sh --plan`. Plan mode validates
44
+ `supersdk.json` and prints Android -> iOS -> Site helper order without invoking
45
+ project build helpers or emitting `SUPERSDK_BUILD_SUMMARY_JSON=`.
46
+
47
+ Build mode validates and injects managed config first, then runs the selected
48
+ project helpers in order. The default `./super_build.sh --build` selects every
49
+ project. `--platform android|ios|site` selects every project of that type;
50
+ `--project <dir>` selects exactly one. Managed config for non-selected projects is
51
+ not created or rewritten.
52
+
53
+ ## Configuration Checklist
54
+
55
+ - Edit `supersdk.json`. It is standard JSON: no comments, no trailing commas.
56
+ - Keep `"schemaVersion": 3`.
57
+ - Set `spid`: the real 8-character lowercase alphanumeric spid issued by the console.
58
+ Replace the example `demo0001`.
59
+ - The root `name` is a **description of the workspace**. It is never projected as an
60
+ App label. Every android/ios project carries its own `name`, and that is the real
61
+ identity (Android app label / iOS display name).
62
+ - Set `package` on each android project and `bundleId` on each ios project. Identity
63
+ is never derived and never inherited: a missing value fails the build instead of
64
+ shipping under the SDK's own reverse-domain namespace.
65
+ - `spmMode` defaults to `mock` and uses the bundled `MockSuperSDKPackage`.
66
+ - For site projects, `offline.host` is optional and is filled in by the CLI after the
67
+ first successful publish. Without it the site still builds `dist/`; only the offline
68
+ zip is skipped, and the reason is printed.
69
+ - `version` and `sdk` may be set at workspace level and overridden per project. An
70
+ override **replaces the whole value** — it is not merged — so a project-level
71
+ `version` must set both `name` and `code`.
72
+ - Run `./super_build.sh --plan`, then `./super_build.sh --build`.
73
+
74
+ ### There is no `environment` in this file
75
+
76
+ `environment` is a **runtime** parameter of `SuperSDK.init`, not build configuration.
77
+ It is not in `supersdk.json`, not in the managed config, and not in `BuildConfig`.
78
+ Omitting it at init time means `prod`. All three demo apps switch environment at
79
+ runtime instead:
80
+
81
+ - Android: buttons in `MainActivity`, persisted by `EnvironmentStore` (SharedPreferences)
82
+ - iOS: a segmented control in `SimpleViewController`, persisted by `EnvironmentStore` (UserDefaults)
83
+ - Web: the `Switch environment` selector, persisted in `localStorage`
84
+
85
+ The rule across the whole toolchain: **configuration says what this is, publishing says
86
+ where it goes, runtime says which environment to talk to.**
87
+
88
+ ### CLI-owned keys
89
+
90
+ `orgId` and each site project's `deploy[]` are owned by `supercli`. The template
91
+ type-checks them (`orgId` a string, `deploy` an array of objects) and otherwise ignores
92
+ them, so a site-side schema change can never break an App build. Any other unrecognized
93
+ root key is kept as-is.
94
+
95
+ `supersdk.json` must be standard JSON in the strict sense. `NaN`, `Infinity`, and
96
+ `-Infinity` are rejected even though Python's parser accepts them, because
97
+ `supercli` reads the same file with `JSON.parse`, which does not.
98
+
99
+ Generated files live under each project's `.supersdk/managed/` directory and
100
+ are safe to overwrite only when they contain `managed_by: supersdk-template`.
101
+ Use `--force` only when intentionally replacing unmanaged target files.
102
+
103
+ ## Migrating From schemaVersion 2
104
+
105
+ `schemaVersion: 3` is breaking and there is no backward compatibility. A v2 config
106
+ fails closed with the exact command to run:
39
107
 
40
108
  ```bash
41
- ./super_build.sh --build --output-dir ./output
109
+ python3 scripts/supersdk_template.py migrate --config supersdk.json
42
110
  ```
43
111
 
44
- Build one stable module:
112
+ The migration is in-place and moves **no files**: the v2 template directories were
113
+ already `android/`, `ios/`, and `web/`, so they become `projects[]` entries pointing at
114
+ the same paths. `sites[]` moves verbatim into the site project's `deploy[]`, the v2
115
+ `name` becomes each android/ios project's `name`, and the retired root `environment` is
116
+ dropped with a printed note.
117
+
118
+ The retired `supersdk.yaml` / `supersdk.yml` / `super-site.yml` files are rejected with
119
+ a copy-pasteable migration command; there is no silent fallback. The command matches the
120
+ situation: with no usable `supersdk.json` it writes the full skeleton first and deletes
121
+ the legacy file last, and when `supersdk.json` is already valid it only offers
122
+ `rm <legacy>` so pasting it cannot overwrite real values.
123
+
124
+ ## Engine Version
125
+
126
+ `scripts/supersdk_template.py` is vendored into every workspace and records its
127
+ `engine_version` in each managed config. `./super_build.sh` compares that recorded
128
+ value with the engine it is about to run and prints a warning when they differ; it
129
+ never blocks. If you see that warning, re-run `./super_build.sh --build` to reproject.
130
+
131
+ ## Site Output And Publishing
132
+
133
+ `<site>/src` is authored input. The site build renders the single publishable
134
+ package root at `<site>/dist`:
45
135
 
46
136
  ```bash
47
- ./super_build.sh --build --project web --output-dir ./output-web
137
+ ./super_build.sh --platform site --build
48
138
  ```
49
139
 
50
- Use another config explicitly:
140
+ That writes `<site>/dist/` (static assets plus the generated
141
+ `supersdk-config.json` the browser fallback reads) and, when `offline.host` is set, the
142
+ offline package `output/<site dir>/<host>@<version>@<md5>.zip`, both from the same tree.
143
+ The zip is not a byte-identical copy of `dist`: it also carries the offline manifest
144
+ `__super_meta.json`, which belongs to the offline package only. Offline packages are
145
+ namespaced by project directory, so two site projects that share a host and version
146
+ cannot overwrite each other's zip.
147
+
148
+ `<site>/dist` is the directory to hand to the site publisher:
51
149
 
52
150
  ```bash
53
- ./super_build.sh --build --config ./super.other.json --output-dir ./output-other
151
+ supercli publish-site web/dist --spid <spid> --slug <slug> --env <env> --version <x.y.z>
54
152
  ```
55
153
 
56
- The output directory must not already exist. A build always uses fixed bundled
57
- helpers; config cannot provide commands or plugins. Android produces APK/AAB,
58
- iOS produces its archive (or an explicit platform-tool skip), site produces a
59
- publishable `dist` plus optional offline zip, and service runs local `docker build`
60
- then `docker save` without logging in, pushing, or creating a registry resource.
154
+ `dist` is a build output: it is gitignored and replaced wholesale on every
155
+ build. Never edit it by hand, and never point the publisher at `<site>/src` — that
156
+ tree has no runtime config and still carries `js/supersdk.provenance.json`.
61
157
 
62
- Every completed output contains `super-build-manifest.json` with:
158
+ For local debugging, `python3 scripts/serve_web.py` serves the built `dist` when it
159
+ exists and falls back to the unbuilt `src` with a warning.
63
160
 
64
- - actual builder `engineVersion`, optional calling `cliVersion`, and builder bundle
65
- digest;
66
- - canonical config digest and SPID;
67
- - Git commit/dirty source metadata when available;
68
- - single/all selection and real per-project status;
69
- - evidence and artifact relative paths, sizes, counts, and SHA-256 values.
161
+ ## Ordered Summary
70
162
 
71
- Paths are relative to the build directory so it can move between machines. A
72
- failed helper stays failed in both the manifest and the final
73
- `SUPERSDK_BUILD_SUMMARY_JSON=...` line.
163
+ Build mode writes exactly one root-owned machine-readable stdout line:
74
164
 
75
- ## Migration from schema v3
165
+ ```text
166
+ SUPERSDK_BUILD_SUMMARY_JSON={"schema_version":2,...}
167
+ ```
76
168
 
77
- Use the installed SuperCLI entrypoint:
169
+ Consumers must parse only lines that start with `SUPERSDK_BUILD_SUMMARY_JSON=`.
170
+ Helper output is forwarded with prefixes such as `[android stderr]`, so helper
171
+ logs cannot create another root summary token. Do not assume the summary is the
172
+ last stdout line: a helper process with a lingering output pipe may still emit a
173
+ late prefixed line after the summary. Locate the summary by its line prefix.
78
174
 
79
- ```bash
80
- supercli config migrate --from supersdk.json --to super.json
81
- ```
175
+ Summary fields are:
176
+
177
+ - `schema_version`
178
+ - `overall_status`
179
+ - `overall_exit_code`
180
+ - `platforms`
181
+ - `platform`
182
+ - `dir`
183
+ - `status`
184
+ - `exit_code`
185
+ - `reason`
186
+ - `command`
187
+
188
+ `platform` is the project type and `dir` is the project directory. A workspace may
189
+ hold several projects of the same type, so `dir` is what identifies a row.
190
+
191
+ Project `status` is `success`, `skipped`, or `failed`. `status=success` means
192
+ the helper exited successfully under the helper contract; artifact-level validation
193
+ is performed by canonical smoke. Long failure reasons are capped and end with
194
+ `...(truncated)` when shortened. Per-project `exit_code` mirrors the helper
195
+ process return code; a negative value means the helper was killed by that signal
196
+ number. Launch errors use synthesized `exit_code=127`; helper timeouts use
197
+ synthesized `exit_code=124`. In both cases, `reason` identifies the sentinel.
198
+
199
+ ## Exit Codes
200
+
201
+ - `0`: usage/config/injection succeeded and no selected project failed.
202
+ - `1` with no summary: config validation or managed-config injection failed
203
+ before project orchestration started.
204
+ - `1` with a summary: at least one selected project had a hard failure after
205
+ project orchestration started.
206
+ - `2` with no summary: usage or argument error, such as an invalid platform.
207
+
208
+ This distinction lets downstream scripts tell a config error from a build
209
+ result by checking for the root summary line. If stdout itself is closed or
210
+ broken by the caller before the root summary can be written, summary emission is
211
+ outside this contract.
82
212
 
83
- The bundled Python authority only writes the target when every v3 field maps
84
- without ambiguity and the generated document passes the strict v4 validator.
85
- Source and target must have the same normalized parent directory. Migration adds
86
- `projectId` from each directory basename and maps site targets to `envTarget`.
87
- Unknown fields, conflicting IDs/targets/output directories, an existing target,
88
- or a cross-directory destination fail before replacement. The source is never
89
- deleted; inspect `super.json`, then explicitly move the retired `supersdk.json`.
90
- While both names coexist, project commands fail closed.
213
+ ## Skip And Hard Failure
91
214
 
92
- ## Managed configuration
215
+ Android and iOS helpers may report toolchain, simulator, or temporary network
216
+ conditions as `skipped` when they exit 0 and a raw stdout/stderr line starts
217
+ with `SKIP_` or `BUILD SKIPPED`. Matching is case-sensitive and does not trim
218
+ leading whitespace. A nonzero helper exit code always wins and is a hard
219
+ failure. Site projects have no skip mode: they are `success` or `failed`.
220
+
221
+ The root build continues through all selected projects after a hard helper
222
+ failure, then returns nonzero with every selected project represented in the
223
+ ordered summary. An internal orchestrator error still emits a failed summary, but
224
+ may stop at the affected project because the runner itself is no longer in a
225
+ trustworthy state.
226
+
227
+ ## Project Prerequisites
228
+
229
+ - Android: executable `<android>/gradlew`, `<android>/gradle/wrapper/gradle-wrapper.jar`,
230
+ JDK 17+, Android SDK, and reachable Maven metadata unless deterministic test
231
+ mode or local metadata fixtures are used.
232
+ - iOS: `<ios>/project.yml`, bundled `<ios>/MockSuperSDKPackage`, `xcodegen`,
233
+ `xcodebuild`, and an available simulator for a full local build. Missing
234
+ local toolchain is reported as an explicit skip unless a non-skippable CI gate
235
+ is requested.
236
+ - Site: bundled static assets `index.html`, `js/app.js`, `js/supersdk.js`,
237
+ `css/style.css`, and `js/supersdk.provenance.json` under `<site>/src`. Site packaging
238
+ uses the Python stdlib zip path and does not require Node/Vite.
239
+
240
+ Maintainers can set `SUPERSDK_BUILD_HELPER_TIMEOUT_SECONDS` to adjust the
241
+ per-helper timeout for CI or smoke troubleshooting. The default is 1800 seconds.
242
+
243
+ ## Canonical Smoke
244
+
245
+ From the repository root, run:
246
+
247
+ ```bash
248
+ python3 supersimples/tests/e2e/build_orchestration_smoke.py
249
+ ```
93
250
 
94
- The authority projects the selected config into
95
- `<project>/.supersdk/managed/config.json`. Managed readers validate the exact v4
96
- shape and engine version. Re-run a build after updating bundled workspace scripts;
97
- an older v3 engine rejects schema v4 instead of guessing new fields.
251
+ The canonical smoke copies this template to a temporary directory outside the
252
+ monorepo, edits `supersdk.json`, verifies project entry assets, pins Android
253
+ SNAPSHOT metadata to a local fixture, forces Android deterministic test mode,
254
+ forces deterministic iOS `SKIP_XCODEGEN_MISSING`, runs the root build, checks
255
+ the ordered summary, checks all three managed configs, verifies a real site zip
256
+ containing `index.html`, `js/app.js`, and `__super_meta.json`, and rejects
257
+ monorepo-only path/module leaks in generated outputs and copied Android/iOS
258
+ build config files. Android and iOS are deterministic non-real-build paths in
259
+ this smoke; site packaging is the real project build. Use a separate toolchain
260
+ CI lane when you need real Android Gradle or iOS simulator compilation.
98
261
 
99
- Generated build state, `.super/deploy-results`, platform build directories, and
100
- portable `output/` directories are ignored by the template `.gitignore`.
262
+ Publishing this template to the public `supersdks/simple` repository is BL-006,
263
+ not part of this feature.
@@ -8,7 +8,7 @@ import android.content.SharedPreferences;
8
8
  *
9
9
  * 🔴 为什么不进 BuildConfig:environment 是 {@code SuperSDK.init} 的**运行时**参数,
10
10
  * 编译期根本不需要它。一旦编进产物,「换个环境看看」就变成「重新配置 + 重新打包」。
11
- * 所以它不在 super.json 里,也不在 managed config 里,只存在于设备上的这份偏好里。
11
+ * 所以它不在 supersdk.json 里,也不在 managed config 里,只存在于设备上的这份偏好里。
12
12
  * 省略环境时 SDK 默认 prod,这里的默认值与之一致。
13
13
  */
14
14
  public final class EnvironmentStore {
@@ -12,13 +12,13 @@ public class SimpleApplication extends Application {
12
12
  @Override
13
13
  public void onCreate() {
14
14
  super.onCreate();
15
- // spid 是编译期身份(来自 super.json),environment 是运行时状态(来自设备偏好)。
15
+ // spid 是编译期身份(来自 supersdk.json),environment 是运行时状态(来自设备偏好)。
16
16
  // 环境独立于 init:SDK 不持久化,进程默认 prod,启动后用 setAPIEnvironment 恢复偏好。
17
17
  try {
18
18
  SuperSDK.setAPIEnvironment(EnvironmentStore.get(this));
19
19
  SuperSDK.init(this, BuildConfig.SUPERSDK_SPID, new SuperSDKProvider() {});
20
20
  } catch (RuntimeException exception) {
21
- Log.e(TAG, "SuperSDK init failed; check super.json and the resolved SDK dependency.", exception);
21
+ Log.e(TAG, "SuperSDK init failed; check supersdk.json and the resolved SDK dependency.", exception);
22
22
  throw exception;
23
23
  }
24
24
  }
@@ -6,12 +6,12 @@ def defaultConfig = new File(androidRoot, "supersdk-default.config.json")
6
6
  def configFile = managedConfig.isFile() ? managedConfig : defaultConfig
7
7
 
8
8
  // 🔴 走 fallback 必须出声。managed config 是 `./super_build.sh --build` 从根目录
9
- // super.json 投影出来的**当前**身份;supersdk-default.config.json 只是仓库里的一份
10
- // 快照,`--plan` 不会刷新它。静默使用快照意味着「改了 super.json 却装出旧身份的包」,
9
+ // supersdk.json 投影出来的**当前**身份;supersdk-default.config.json 只是仓库里的一份
10
+ // 快照,`--plan` 不会刷新它。静默使用快照意味着「改了 supersdk.json 却装出旧身份的包」,
11
11
  // 而且构建照样 exit 0 —— 这类静默成功比直接失败危险得多。
12
12
  if (!managedConfig.isFile()) {
13
13
  logger.warn("SuperSDK: ${managedConfig} 不存在,回退使用 ${defaultConfig.name} 里的快照身份。" +
14
- "改过 super.json 的话请先跑 ./super_build.sh --build 重新投影,否则产物身份可能是旧的。")
14
+ "改过 supersdk.json 的话请先跑 ./super_build.sh --build 重新投影,否则产物身份可能是旧的。")
15
15
  }
16
16
 
17
17
  if (!configFile.isFile()) {
@@ -46,8 +46,8 @@ def sdk = config.sdk instanceof Map ? config.sdk : [:]
46
46
  if (config.managed_by != "supersdk-template") {
47
47
  throw new GradleException("SuperSDK Android config invalid at ${configFile}: managed_by must be supersdk-template")
48
48
  }
49
- if (config.schema_version != 4) {
50
- throw new GradleException("SuperSDK Android config invalid at ${configFile}: schema_version must be 4")
49
+ if (config.schema_version != 3) {
50
+ throw new GradleException("SuperSDK Android config invalid at ${configFile}: schema_version must be 3")
51
51
  }
52
52
  def versionCodeValue = version.code
53
53
  if (!(versionCodeValue instanceof Number)) {
@@ -59,7 +59,6 @@ if (versionCodeDecimal.scale() > 0 || versionCodeDecimal < BigDecimal.ONE || ver
59
59
  }
60
60
 
61
61
  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
62
  ext.supersdkSpid = requireMatchingString(config.spid, "spid", /[a-z0-9]{8}/, 'must match ^[a-z0-9]{8}$')
64
63
  // 🔴 这里**没有** environment。它是 SuperSDK.init 的运行时参数,编译期不需要,
65
64
  // 也就不该进 BuildConfig —— 一旦编进产物,换环境就等于重新打包。
@@ -1,14 +1,13 @@
1
1
  {
2
2
  "dir": "android",
3
- "engine_version": "4.0.0",
3
+ "engine_version": "3.0.0",
4
4
  "managed_by": "supersdk-template",
5
5
  "name": "SuperSDK Simple",
6
6
  "platform": "android",
7
7
  "platform_config": {
8
8
  "package": "com.supersdk.simple.host"
9
9
  },
10
- "project_id": "android",
11
- "schema_version": 4,
10
+ "schema_version": 3,
12
11
  "sdk": {
13
12
  "androidVersion": "1.0.0.57-SNAPSHOT"
14
13
  },
@@ -9,7 +9,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
9
9
  do {
10
10
  try SimpleSDKBootstrap.initialize()
11
11
  } catch {
12
- fatalError("SuperSDK init failed; check super.json identity: \(error)")
12
+ fatalError("SuperSDK init failed; check supersdk.json identity: \(error)")
13
13
  }
14
14
  return true
15
15
  }
@@ -2,7 +2,7 @@ import SuperSDK
2
2
 
3
3
  enum SimpleSDKBootstrap {
4
4
  static func initialize() throws {
5
- // spid 是编译期身份(投影自 super.json),environment 是运行时选择。
5
+ // spid 是编译期身份(投影自 supersdk.json),environment 是运行时选择。
6
6
  try SuperSDKManager.shared.initialize(
7
7
  spid: SimpleConfig.spid,
8
8
  environment: EnvironmentStore.current,
@@ -7,14 +7,11 @@ 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/super.json"
11
- PROJECT_ID=""
10
+ CONFIG="$WORKSPACE_ROOT/supersdk.json"
12
11
  PROJECT_DIR=""
13
- OUTPUT_DIR=""
14
- EVIDENCE_PATH=""
15
12
 
16
13
  usage() {
17
- echo "Usage: scripts/build_android.sh --build --config PATH --project-id ID --output-dir DIR --evidence FILE" >&2
14
+ echo "Usage: scripts/build_android.sh --build [--project DIR] [--config path]" >&2
18
15
  }
19
16
 
20
17
  skip_toolchain() {
@@ -90,12 +87,12 @@ while [ "$#" -gt 0 ]; do
90
87
  build_seen=true
91
88
  shift
92
89
  ;;
93
- --project-id)
90
+ --project)
94
91
  if [ "$#" -lt 2 ]; then
95
92
  usage
96
93
  exit 2
97
94
  fi
98
- PROJECT_ID="$2"
95
+ PROJECT_DIR="$2"
99
96
  shift 2
100
97
  ;;
101
98
  --config)
@@ -106,12 +103,6 @@ while [ "$#" -gt 0 ]; do
106
103
  CONFIG="$2"
107
104
  shift 2
108
105
  ;;
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
106
  *)
116
107
  usage
117
108
  exit 2
@@ -124,18 +115,15 @@ fi
124
115
 
125
116
  # 项目目录来自配置,不是固定层级。省略 --project 时由引擎解析:唯一 android 项目才放行,
126
117
  # 多个就要求显式指定,绝不「挑第一个」。
127
- if [ -z "$PROJECT_ID" ]; then PROJECT_ID="android"; fi
128
- PROJECT_DIR="$("$PYTHON_BIN" "$HELPER" resolve --config "$CONFIG" --platform android --project "$PROJECT_ID")"
118
+ if [ -z "$PROJECT_DIR" ]; then
119
+ PROJECT_DIR="$("$PYTHON_BIN" "$HELPER" resolve --config "$CONFIG" --platform android)"
120
+ fi
129
121
  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
122
 
133
- "$PYTHON_BIN" "$HELPER" inject --root "$WORKSPACE_ROOT" --config "$CONFIG" --platform android --project "$PROJECT_ID"
123
+ "$PYTHON_BIN" "$HELPER" inject --root "$WORKSPACE_ROOT" --config "$CONFIG" --platform android --project "$PROJECT_DIR"
134
124
 
135
125
  if [ "${SUPERSDK_ANDROID_BUILD_TEST_MODE:-0}" = "1" ]; then
136
126
  run_snapshot_canary
137
- mkdir -p "$OUTPUT_DIR"
138
- printf 'SUPERSDK_ANDROID_BUILD_TEST_MODE\n' > "$OUTPUT_DIR/app-debug.apk"
139
127
  echo "SUPERSDK_ANDROID_BUILD_TEST_MODE: would run $ANDROID_ROOT/gradlew :app:assembleDebug"
140
128
  exit 0
141
129
  fi
@@ -336,7 +324,7 @@ Path(target).write_text(json.dumps(payload, indent=2, sort_keys=True) + "\n", en
336
324
  if identity_mismatches:
337
325
  lines = [
338
326
  "",
339
- "SuperSDK identity check %s: the APK does not carry the identity declared in super.json."
327
+ "SuperSDK identity check %s: the APK does not carry the identity declared in supersdk.json."
340
328
  % ("FAILED" if identity_status == "mismatch" else "warning"),
341
329
  "",
342
330
  ]
@@ -366,7 +354,7 @@ if identity_mismatches:
366
354
  " * wire the project to the managed config -- `supercli register android %s` reprints the"
367
355
  % config["dir"],
368
356
  " 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.",
357
+ " * correct projects[].package in supersdk.json so it states what this project really builds.",
370
358
  ]
371
359
  sys.stderr.write("\n".join(lines) + "\n")
372
360
  raise SystemExit(1)
@@ -376,7 +364,3 @@ if identity_mismatches:
376
364
  ]
377
365
  sys.stderr.write("\n".join(lines) + "\n")
378
366
  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"