@supersdk/supercli 0.1.1-staging.2 → 0.1.1-staging.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 (34) hide show
  1. package/dist/commands/createApp.js +14 -58
  2. package/dist/commands/createApp.js.map +1 -1
  3. package/dist/commands/publishSite.js +286 -209
  4. package/dist/commands/publishSite.js.map +1 -1
  5. package/dist/createApp/copyTemplate.js +38 -53
  6. package/dist/createApp/copyTemplate.js.map +1 -1
  7. package/dist/publish/offlineVersion.js +33 -0
  8. package/dist/publish/offlineVersion.js.map +1 -0
  9. package/dist/publish/orgResolve.js +16 -17
  10. package/dist/publish/orgResolve.js.map +1 -1
  11. package/dist/publish/responseClassifier.js +17 -7
  12. package/dist/publish/responseClassifier.js.map +1 -1
  13. package/dist/publish/siteClient.js +19 -10
  14. package/dist/publish/siteClient.js.map +1 -1
  15. package/dist/publish/siteConfig.js +166 -124
  16. package/dist/publish/siteConfig.js.map +1 -1
  17. package/dist/template/README.md +11 -1
  18. package/dist/template/android/app/build.gradle.kts +6 -3
  19. package/dist/template/android/app/src/main/java/com/supersdk/simple/SimpleApplication.java +1 -1
  20. package/dist/template/android/gradle/supersdk-config-reader.gradle +2 -1
  21. package/dist/template/android/supersdk-default.config.json +3 -2
  22. package/dist/template/ios/MockSuperSDKPackage/Sources/SuperSDK/SuperSDK.swift +20 -4
  23. package/dist/template/ios/Sources/App/AppDelegate.swift +5 -1
  24. package/dist/template/ios/Sources/App/SimpleSDKBootstrap.swift +6 -2
  25. package/dist/template/ios/Sources/App/SimpleSDKProbe.swift +7 -4
  26. package/dist/template/ios/Tests/SimpleAppTests/SimpleSDKInitializationTests.swift +2 -1
  27. package/dist/template/scripts/build_ios.sh +13 -9
  28. package/dist/template/scripts/supersdk_template.py +15 -8
  29. package/dist/template/supersdk.yaml +3 -2
  30. package/dist/template/web/src/index.html +6 -2
  31. package/dist/template/web/src/js/app.js +6 -3
  32. package/dist/template/web/src/js/supersdk.js +229 -91
  33. package/dist/template/web/src/js/supersdk.provenance.json +3 -3
  34. package/package.json +1 -1
@@ -35,156 +35,198 @@ var __importStar = (this && this.__importStar) || (function () {
35
35
  Object.defineProperty(exports, "__esModule", { value: true });
36
36
  exports.SCHEMA_VERSION = exports.SITE_CONFIG_FILENAME = void 0;
37
37
  exports.siteConfigPath = siteConfigPath;
38
+ exports.isValidSpid = isValidSpid;
39
+ exports.isValidSlug = isValidSlug;
40
+ exports.isValidEnvironment = isValidEnvironment;
41
+ exports.isValidOrgId = isValidOrgId;
42
+ exports.parseSiteConfig = parseSiteConfig;
38
43
  exports.readSiteConfig = readSiteConfig;
39
44
  exports.renderSiteConfig = renderSiteConfig;
40
45
  exports.writeSiteConfig = writeSiteConfig;
41
- exports.validateSlug = validateSlug;
42
- exports.deriveDefaultSlug = deriveDefaultSlug;
43
- // super-site.yml — the local site-binding file publish-site reads/writes.
44
- // Fixed schema (NO yaml library, per TECH.md §模块4 rejected-alternatives):
45
- //
46
- // schema_version: 1
47
- // site:
48
- // id: <id>
49
- // slug: <slug>
50
- // name: <name>
51
- //
52
- // Hand-rolled: a minimal line-based reader for exactly these keys, and a
53
- // template-string writer. The template dialect stays flat (no nesting beyond
54
- // `site:`) so a line reader is sufficient and round-trip-stable.
46
+ // Strict schema-v2 binding for publish-site. This deliberately supports only
47
+ // the small YAML shape we write; malformed or legacy files must never be
48
+ // interpreted as an unbound directory that could publish to a guessed target.
55
49
  const fs = __importStar(require("node:fs"));
56
50
  const path = __importStar(require("node:path"));
57
- const log_1 = require("../util/log");
58
51
  const fsAtomic_1 = require("../util/fsAtomic");
59
52
  exports.SITE_CONFIG_FILENAME = 'super-site.yml';
60
- exports.SCHEMA_VERSION = 1;
53
+ exports.SCHEMA_VERSION = 2;
61
54
  function siteConfigPath(dir) {
62
55
  return path.join(dir, exports.SITE_CONFIG_FILENAME);
63
56
  }
64
- function unquote(value) {
57
+ function isValidSpid(value) {
58
+ return /^[a-z0-9]{8}$/.test(value);
59
+ }
60
+ function isValidSlug(value) {
61
+ return /^[a-z0-9]{1,32}$/.test(value) && value !== 'stg';
62
+ }
63
+ function isValidEnvironment(value) {
64
+ return /^[a-z0-9]{1,10}$/.test(value);
65
+ }
66
+ function isValidOrgId(value) {
67
+ return /^[1-9][0-9]*$/.test(value);
68
+ }
69
+ function scalar(value) {
65
70
  const trimmed = value.trim();
66
- if (trimmed.length >= 2) {
67
- const first = trimmed[0];
68
- const last = trimmed[trimmed.length - 1];
69
- if ((first === '"' && last === '"') || (first === "'" && last === "'")) {
70
- return trimmed.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
71
- }
71
+ if (trimmed.length === 0)
72
+ return undefined;
73
+ const first = trimmed[0];
74
+ const last = trimmed[trimmed.length - 1];
75
+ if (first === '"' || first === "'") {
76
+ if (last !== first || trimmed.length < 2)
77
+ return undefined;
78
+ return trimmed.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
72
79
  }
80
+ // A nested collection/anchor/tag is outside the fixed binding dialect.
81
+ if (/^[\[{&*!|>]/.test(trimmed))
82
+ return undefined;
73
83
  return trimmed;
74
84
  }
75
- /**
76
- * Reads <dir>/super-site.yml. Returns null when the file is absent or missing a
77
- * usable `site.slug` (treated as "not bound yet" — caller falls through to the
78
- * create/rebind path rather than crashing on a partial file).
79
- */
80
- function readSiteConfig(dir) {
81
- let raw;
82
- try {
83
- raw = fs.readFileSync(siteConfigPath(dir), 'utf8');
84
- }
85
- catch (err) {
86
- if (err.code === 'ENOENT')
87
- return null;
88
- log_1.log.warn('siteConfig.read: failed reading super-site.yml, treating as unbound', {
89
- error: err.message,
90
- });
91
- return null;
85
+ function invalid(reason) {
86
+ return { kind: 'invalid', reason };
87
+ }
88
+ /** Parses only the exact v2 shape. Unknown, duplicate, or misplaced keys fail closed. */
89
+ function parseSiteConfig(raw) {
90
+ // v1 carried only site identity. Recognize it before the strict v2 parser so
91
+ // its retired `site.id` key cannot turn a migration diagnostic into a generic
92
+ // invalid-file error. Missing project/org/environment are never inferred.
93
+ if (/^schema_version:\s*["']?1["']?\s*$/m.test(raw)) {
94
+ let inSite = false;
95
+ let slug = '';
96
+ let name = '';
97
+ for (const originalLine of raw.split(/\r?\n/)) {
98
+ const root = originalLine.match(/^([A-Za-z_][A-Za-z0-9_]*):\s*(.*)$/);
99
+ if (root) {
100
+ inSite = root[1] === 'site' && root[2].trim().length === 0;
101
+ continue;
102
+ }
103
+ if (!inSite)
104
+ continue;
105
+ const child = originalLine.match(/^ {2}(slug|name):\s*(.*)$/);
106
+ if (!child)
107
+ continue;
108
+ const parsed = scalar(child[2]);
109
+ if (parsed === undefined)
110
+ continue;
111
+ if (child[1] === 'slug')
112
+ slug = parsed;
113
+ else
114
+ name = parsed;
115
+ }
116
+ return slug ? { kind: 'legacy-v1', site: { slug, name: name || slug } } : { kind: 'legacy-v1' };
92
117
  }
93
- let inSite = false;
94
- let id = '';
95
- let slug = '';
96
- let name = '';
97
- for (const line of raw.split(/\r?\n/)) {
98
- if (line.trim().length === 0 || line.trim().startsWith('#'))
99
- continue;
100
- const indented = /^\s+/.test(line);
101
- const match = line.match(/^\s*([A-Za-z_][A-Za-z0-9_]*):\s*(.*)$/);
102
- if (!match)
103
- continue;
104
- const key = match[1];
105
- const value = match[2];
106
- if (!indented) {
107
- inSite = key === 'site';
118
+ let version;
119
+ let environment;
120
+ const project = {};
121
+ const site = {};
122
+ let section;
123
+ const seen = new Set();
124
+ for (const originalLine of raw.split(/\r?\n/)) {
125
+ const line = originalLine.trimEnd();
126
+ if (line.trim().length === 0 || line.trimStart().startsWith('#'))
108
127
  continue;
128
+ const root = line.match(/^([A-Za-z_][A-Za-z0-9_]*):\s*(.*)$/);
129
+ if (root) {
130
+ const [, key, value] = root;
131
+ if (key === 'schema_version' || key === 'environment') {
132
+ if (seen.has(key))
133
+ return invalid(`duplicate root key: ${key}`);
134
+ seen.add(key);
135
+ const parsed = scalar(value);
136
+ if (parsed === undefined)
137
+ return invalid(`${key} must be a scalar`);
138
+ if (key === 'schema_version')
139
+ version = parsed;
140
+ else
141
+ environment = parsed;
142
+ section = undefined;
143
+ continue;
144
+ }
145
+ if (key === 'project' || key === 'site') {
146
+ if (seen.has(key))
147
+ return invalid(`duplicate root key: ${key}`);
148
+ seen.add(key);
149
+ if (value.trim().length !== 0)
150
+ return invalid(`${key} must be a mapping`);
151
+ section = key;
152
+ continue;
153
+ }
154
+ return invalid(`unknown root key: ${key}`);
155
+ }
156
+ const child = line.match(/^ {2}([A-Za-z_][A-Za-z0-9_]*):\s*(.*)$/);
157
+ if (!child || !section)
158
+ return invalid('invalid indentation or mapping structure');
159
+ const [, key, value] = child;
160
+ const parsed = scalar(value);
161
+ if (parsed === undefined)
162
+ return invalid(`${section}.${key} must be a scalar`);
163
+ const field = `${section}.${key}`;
164
+ if (seen.has(field))
165
+ return invalid(`duplicate key: ${field}`);
166
+ seen.add(field);
167
+ if (section === 'project' && (key === 'spid' || key === 'org_id')) {
168
+ if (key === 'spid')
169
+ project.spid = parsed;
170
+ else
171
+ project.orgId = parsed;
172
+ }
173
+ else if (section === 'site' && (key === 'slug' || key === 'name')) {
174
+ if (key === 'slug')
175
+ site.slug = parsed;
176
+ else
177
+ site.name = parsed;
178
+ }
179
+ else {
180
+ return invalid(`unknown key: ${field}`);
109
181
  }
110
- if (!inSite)
111
- continue;
112
- if (key === 'id')
113
- id = unquote(value);
114
- else if (key === 'slug')
115
- slug = unquote(value);
116
- else if (key === 'name')
117
- name = unquote(value);
118
182
  }
119
- if (slug.length === 0) {
120
- log_1.log.warn('siteConfig.read: super-site.yml has no site.slug, treating as unbound');
121
- return null;
183
+ if (version !== String(exports.SCHEMA_VERSION))
184
+ return invalid('schema_version must equal 2');
185
+ if (!environment || !project.spid || !project.orgId || !site.slug || !site.name) {
186
+ return invalid('schema v2 requires project.spid, project.org_id, site.slug, site.name, and environment');
187
+ }
188
+ if (!isValidSpid(project.spid))
189
+ return invalid('project.spid must be 8 lowercase alphanumeric characters');
190
+ if (!isValidOrgId(project.orgId))
191
+ return invalid('project.org_id must be a positive integer');
192
+ if (!isValidSlug(site.slug))
193
+ return invalid('site.slug must be 1-32 lowercase alphanumeric characters and not stg');
194
+ if (site.name.trim().length === 0 || Array.from(site.name).length > 50)
195
+ return invalid('site.name must contain 1-50 characters');
196
+ if (!isValidEnvironment(environment))
197
+ return invalid('environment must be 1-10 lowercase alphanumeric characters');
198
+ return { kind: 'valid-v2', config: { schemaVersion: exports.SCHEMA_VERSION, project: project, site: site, environment } };
199
+ }
200
+ function readSiteConfig(dir) {
201
+ try {
202
+ return parseSiteConfig(fs.readFileSync(siteConfigPath(dir), 'utf8'));
203
+ }
204
+ catch (error) {
205
+ if (error.code === 'ENOENT')
206
+ return { kind: 'absent' };
207
+ return invalid(`could not read ${exports.SITE_CONFIG_FILENAME}: ${error.message}`);
122
208
  }
123
- return { id, slug, name: name.length > 0 ? name : slug };
124
209
  }
125
210
  function quote(value) {
126
211
  return `"${value.replace(/\\/g, '\\\\').replace(/"/g, '\\"')}"`;
127
212
  }
128
- function renderIdValue(id) {
129
- // Numeric ids can be written bare; anything else is quoted for safety.
130
- return /^\d+$/.test(id) ? id : quote(id);
131
- }
132
213
  function renderSiteConfig(config) {
133
- return (`schema_version: ${exports.SCHEMA_VERSION}\n` +
134
- `site:\n` +
135
- ` id: ${renderIdValue(config.id)}\n` +
136
- ` slug: ${config.slug}\n` +
137
- ` name: ${quote(config.name)}\n`);
214
+ return [
215
+ `schema_version: ${exports.SCHEMA_VERSION}`,
216
+ 'project:',
217
+ ` spid: ${config.project.spid}`,
218
+ ` org_id: ${config.project.orgId}`,
219
+ 'site:',
220
+ ` slug: ${config.site.slug}`,
221
+ ` name: ${quote(config.site.name)}`,
222
+ `environment: ${config.environment}`,
223
+ '',
224
+ ].join('\n');
138
225
  }
139
226
  function writeSiteConfig(dir, config) {
140
- // Atomic temp+rename: a crash mid-write must never leave a truncated
141
- // super-site.yml, which readSiteConfig would silently treat as "unbound" and
142
- // fall through to the auto-create path (EXT-7).
227
+ const parsed = parseSiteConfig(renderSiteConfig(config));
228
+ if (parsed.kind !== 'valid-v2')
229
+ throw new Error(`refusing to write invalid schema v2 binding: ${parsed.kind === 'invalid' ? parsed.reason : parsed.kind}`);
143
230
  (0, fsAtomic_1.atomicWriteFileSync)(siteConfigPath(dir), renderSiteConfig(config));
144
231
  }
145
- // ---- slug validation / default derivation (mirrors service.rs validate_slug) ----
146
- const RESERVED_SLUGS = new Set([
147
- 'www',
148
- 'api',
149
- 'admin',
150
- 'console',
151
- 'static',
152
- 'assets',
153
- 'cdn',
154
- 'mail',
155
- 'ftp',
156
- 'localhost',
157
- 'root',
158
- 'support',
159
- 'status',
160
- ]);
161
- /** Mirrors the backend `validate_slug` shape + reserved-word rules exactly. */
162
- function validateSlug(slug) {
163
- const shapeOk = slug.length >= 1 &&
164
- slug.length <= 40 &&
165
- /^[a-z0-9]$/.test(slug[0]) &&
166
- /^[a-z0-9]$/.test(slug[slug.length - 1]) &&
167
- /^[a-z0-9-]+$/.test(slug);
168
- if (!shapeOk) {
169
- return { ok: false, reason: 'slug 需为 1-40 位小写字母、数字或内部连字符(首末为字母数字)' };
170
- }
171
- if (RESERVED_SLUGS.has(slug) || slug === 'stg' || slug.startsWith('stg-')) {
172
- return { ok: false, reason: 'slug 命中保留字' };
173
- }
174
- return { ok: true };
175
- }
176
- /**
177
- * Derives a default slug from a directory basename. The basename is lowercased
178
- * and then validated against the slug rules AS-IS — it is NOT aggressively
179
- * rewritten (e.g. underscores are not turned into hyphens), because a directory
180
- * whose name does not already look like a slug (uppercase/underscore/reserved)
181
- * must fail closed and require an explicit --slug rather than silently binding
182
- * to a guessed name (TC-S27).
183
- */
184
- function deriveDefaultSlug(basename) {
185
- const candidate = basename.trim().toLowerCase();
186
- if (candidate.length === 0)
187
- return null;
188
- return validateSlug(candidate).ok ? candidate : null;
189
- }
190
232
  //# sourceMappingURL=siteConfig.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"siteConfig.js","sourceRoot":"","sources":["../../src/publish/siteConfig.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"siteConfig.js","sourceRoot":"","sources":["../../src/publish/siteConfig.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuBA,wCAEC;AAED,kCAEC;AAED,kCAEC;AAED,gDAEC;AAED,oCAEC;AAqBD,0CAsFC;AAED,wCAOC;AAMD,4CAYC;AAED,0CAIC;AArLD,6EAA6E;AAC7E,yEAAyE;AACzE,8EAA8E;AAC9E,4CAA8B;AAC9B,gDAAkC;AAClC,+CAAuD;AAE1C,QAAA,oBAAoB,GAAG,gBAAgB,CAAC;AACxC,QAAA,cAAc,GAAG,CAAU,CAAC;AAezC,SAAgB,cAAc,CAAC,GAAW;IACxC,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,4BAAoB,CAAC,CAAC;AAC9C,CAAC;AAED,SAAgB,WAAW,CAAC,KAAa;IACvC,OAAO,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACrC,CAAC;AAED,SAAgB,WAAW,CAAC,KAAa;IACvC,OAAO,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,KAAK,CAAC;AAC3D,CAAC;AAED,SAAgB,kBAAkB,CAAC,KAAa;IAC9C,OAAO,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACxC,CAAC;AAED,SAAgB,YAAY,CAAC,KAAa;IACxC,OAAO,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,MAAM,CAAC,KAAa;IAC3B,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC3C,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACzB,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACzC,IAAI,KAAK,KAAK,GAAG,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;QACnC,IAAI,IAAI,KAAK,KAAK,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,SAAS,CAAC;QAC3D,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC1E,CAAC;IACD,uEAAuE;IACvE,IAAI,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,SAAS,CAAC;IAClD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,OAAO,CAAC,MAAc;IAC7B,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;AACrC,CAAC;AAED,yFAAyF;AACzF,SAAgB,eAAe,CAAC,GAAW;IACzC,6EAA6E;IAC7E,8EAA8E;IAC9E,0EAA0E;IAC1E,IAAI,qCAAqC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACpD,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,KAAK,MAAM,YAAY,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9C,MAAM,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;YACtE,IAAI,IAAI,EAAE,CAAC;gBACT,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC;gBAC3D,SAAS;YACX,CAAC;YACD,IAAI,CAAC,MAAM;gBAAE,SAAS;YACtB,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;YAC9D,IAAI,CAAC,KAAK;gBAAE,SAAS;YACrB,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAChC,IAAI,MAAM,KAAK,SAAS;gBAAE,SAAS;YACnC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,MAAM;gBAAE,IAAI,GAAG,MAAM,CAAC;;gBAClC,IAAI,GAAG,MAAM,CAAC;QACrB,CAAC;QACD,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IAClG,CAAC;IACD,IAAI,OAA2B,CAAC;IAChC,IAAI,WAA+B,CAAC;IACpC,MAAM,OAAO,GAAqC,EAAE,CAAC;IACrD,MAAM,IAAI,GAAkC,EAAE,CAAC;IAC/C,IAAI,OAAuC,CAAC;IAC5C,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAE/B,KAAK,MAAM,YAAY,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,EAAE,CAAC;QACpC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,SAAS;QAC3E,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;QAC9D,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC;YAC5B,IAAI,GAAG,KAAK,gBAAgB,IAAI,GAAG,KAAK,aAAa,EAAE,CAAC;gBACtD,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;oBAAE,OAAO,OAAO,CAAC,uBAAuB,GAAG,EAAE,CAAC,CAAC;gBAChE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACd,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;gBAC7B,IAAI,MAAM,KAAK,SAAS;oBAAE,OAAO,OAAO,CAAC,GAAG,GAAG,mBAAmB,CAAC,CAAC;gBACpE,IAAI,GAAG,KAAK,gBAAgB;oBAAE,OAAO,GAAG,MAAM,CAAC;;oBAC1C,WAAW,GAAG,MAAM,CAAC;gBAC1B,OAAO,GAAG,SAAS,CAAC;gBACpB,SAAS;YACX,CAAC;YACD,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;gBACxC,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;oBAAE,OAAO,OAAO,CAAC,uBAAuB,GAAG,EAAE,CAAC,CAAC;gBAChE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACd,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC;oBAAE,OAAO,OAAO,CAAC,GAAG,GAAG,oBAAoB,CAAC,CAAC;gBAC1E,OAAO,GAAG,GAAG,CAAC;gBACd,SAAS;YACX,CAAC;YACD,OAAO,OAAO,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAC;QAC7C,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;QACnE,IAAI,CAAC,KAAK,IAAI,CAAC,OAAO;YAAE,OAAO,OAAO,CAAC,0CAA0C,CAAC,CAAC;QACnF,MAAM,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC;QAC7B,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7B,IAAI,MAAM,KAAK,SAAS;YAAE,OAAO,OAAO,CAAC,GAAG,OAAO,IAAI,GAAG,mBAAmB,CAAC,CAAC;QAC/E,MAAM,KAAK,GAAG,GAAG,OAAO,IAAI,GAAG,EAAE,CAAC;QAClC,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;YAAE,OAAO,OAAO,CAAC,kBAAkB,KAAK,EAAE,CAAC,CAAC;QAC/D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAChB,IAAI,OAAO,KAAK,SAAS,IAAI,CAAC,GAAG,KAAK,MAAM,IAAI,GAAG,KAAK,QAAQ,CAAC,EAAE,CAAC;YAClE,IAAI,GAAG,KAAK,MAAM;gBAAE,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC;;gBACrC,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC;QAC9B,CAAC;aAAM,IAAI,OAAO,KAAK,MAAM,IAAI,CAAC,GAAG,KAAK,MAAM,IAAI,GAAG,KAAK,MAAM,CAAC,EAAE,CAAC;YACpE,IAAI,GAAG,KAAK,MAAM;gBAAE,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC;;gBAClC,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC;QAC1B,CAAC;aAAM,CAAC;YACN,OAAO,OAAO,CAAC,gBAAgB,KAAK,EAAE,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IAED,IAAI,OAAO,KAAK,MAAM,CAAC,sBAAc,CAAC;QAAE,OAAO,OAAO,CAAC,6BAA6B,CAAC,CAAC;IACtF,IAAI,CAAC,WAAW,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAChF,OAAO,OAAO,CAAC,wFAAwF,CAAC,CAAC;IAC3G,CAAC;IACD,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;QAAE,OAAO,OAAO,CAAC,0DAA0D,CAAC,CAAC;IAC3G,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,OAAO,CAAC,2CAA2C,CAAC,CAAC;IAC9F,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,OAAO,CAAC,sEAAsE,CAAC,CAAC;IACpH,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,EAAE;QAAE,OAAO,OAAO,CAAC,wCAAwC,CAAC,CAAC;IACjI,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC;QAAE,OAAO,OAAO,CAAC,4DAA4D,CAAC,CAAC;IACnH,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,sBAAc,EAAE,OAAO,EAAE,OAAkC,EAAE,IAAI,EAAE,IAA4B,EAAE,WAAW,EAAE,EAAE,CAAC;AACvK,CAAC;AAED,SAAgB,cAAc,CAAC,GAAW;IACxC,IAAI,CAAC;QACH,OAAO,eAAe,CAAC,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACvE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;QAClF,OAAO,OAAO,CAAC,kBAAkB,4BAAoB,KAAM,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;IACxF,CAAC;AACH,CAAC;AAED,SAAS,KAAK,CAAC,KAAa;IAC1B,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC;AAClE,CAAC;AAED,SAAgB,gBAAgB,CAAC,MAAoB;IACnD,OAAO;QACL,mBAAmB,sBAAc,EAAE;QACnC,UAAU;QACV,WAAW,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE;QAChC,aAAa,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE;QACnC,OAAO;QACP,WAAW,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE;QAC7B,WAAW,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QACpC,gBAAgB,MAAM,CAAC,WAAW,EAAE;QACpC,EAAE;KACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,SAAgB,eAAe,CAAC,GAAW,EAAE,MAAoB;IAC/D,MAAM,MAAM,GAAG,eAAe,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;IACzD,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU;QAAE,MAAM,IAAI,KAAK,CAAC,gDAAgD,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3J,IAAA,8BAAmB,EAAC,cAAc,CAAC,GAAG,CAAC,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;AACrE,CAAC"}
@@ -31,7 +31,10 @@ rewritten.
31
31
 
32
32
  - Edit `supersdk.yaml`.
33
33
  - Keep `schema_version: 1`.
34
- - Set `app_id` and `name`.
34
+ - Set `spid`, `environment`, and `name`. Replace the example `demo0001` with
35
+ the real 8-character lowercase alphanumeric spid issued by the console.
36
+ - Keep `environment: prod` for production, or use an explicit 1–10 character
37
+ lowercase alphanumeric environment such as `staging`.
35
38
  - Set `android.package` for Android builds.
36
39
  - Set `ios.bundleId` when a specific bundle identifier is needed; default
37
40
  `ios.spmMode: mock` uses the bundled `ios/MockSuperSDKPackage`.
@@ -142,3 +145,10 @@ CI lane when you need real Android Gradle or iOS simulator compilation.
142
145
 
143
146
  Publishing this template to the public `supersdks/simple` repository is BL-006,
144
147
  not part of this feature.
148
+
149
+ ## BREAKING identity migration
150
+
151
+ The root `app_id` key is retired. Rename it to `spid`, add `environment`
152
+ (`prod` when omitted by SDK callers), then rerun `./super_build.sh --plan`.
153
+ The managed Android, iOS, and Web configs are all projected from these same
154
+ root values; do not maintain platform-specific identity aliases.
@@ -11,7 +11,8 @@ plugins {
11
11
 
12
12
  apply(from = "../gradle/supersdk-config-reader.gradle")
13
13
 
14
- val supersdkAppId = extra["supersdkAppId"] as String
14
+ val supersdkSpid = extra["supersdkSpid"] as String
15
+ val supersdkEnvironment = extra["supersdkEnvironment"] as String
15
16
  val supersdkAppName = extra["supersdkAppName"] as String
16
17
  val supersdkApplicationId = extra["supersdkApplicationId"] as String
17
18
  val supersdkVersionName = extra["supersdkVersionName"] as String
@@ -78,11 +79,13 @@ android {
78
79
 
79
80
  buildTypes {
80
81
  debug {
81
- buildConfigField("String", "SUPERSDK_APP_ID", quotedJavaString(supersdkAppId))
82
+ buildConfigField("String", "SUPERSDK_SPID", quotedJavaString(supersdkSpid))
83
+ buildConfigField("String", "SUPERSDK_ENVIRONMENT", quotedJavaString(supersdkEnvironment))
82
84
  buildConfigField("String", "SUPERSDK_APP_NAME", quotedJavaString(supersdkAppName))
83
85
  }
84
86
  release {
85
- buildConfigField("String", "SUPERSDK_APP_ID", quotedJavaString(supersdkAppId))
87
+ buildConfigField("String", "SUPERSDK_SPID", quotedJavaString(supersdkSpid))
88
+ buildConfigField("String", "SUPERSDK_ENVIRONMENT", quotedJavaString(supersdkEnvironment))
86
89
  buildConfigField("String", "SUPERSDK_APP_NAME", quotedJavaString(supersdkAppName))
87
90
  isMinifyEnabled = false
88
91
  }
@@ -13,7 +13,7 @@ public class SimpleApplication extends Application {
13
13
  public void onCreate() {
14
14
  super.onCreate();
15
15
  try {
16
- SuperSDK.init(this, BuildConfig.SUPERSDK_APP_ID, new SuperSDKProvider() {});
16
+ SuperSDK.init(this, BuildConfig.SUPERSDK_SPID, BuildConfig.SUPERSDK_ENVIRONMENT, new SuperSDKProvider() {});
17
17
  } catch (RuntimeException exception) {
18
18
  Log.e(TAG, "SuperSDK init failed; check supersdk.yaml and the resolved SDK dependency.", exception);
19
19
  throw exception;
@@ -50,7 +50,8 @@ if (versionCodeDecimal.scale() > 0 || versionCodeDecimal < BigDecimal.ONE || ver
50
50
  }
51
51
 
52
52
  ext.supersdkAndroidConfigPath = configFile.absolutePath
53
- ext.supersdkAppId = requireMatchingString(config.app_id, "app_id", /[A-Za-z][A-Za-z0-9_-]{2,63}/, 'must match ^[A-Za-z][A-Za-z0-9_-]{2,63}$')
53
+ ext.supersdkSpid = requireMatchingString(config.spid, "spid", /[a-z0-9]{8}/, 'must match ^[a-z0-9]{8}$')
54
+ ext.supersdkEnvironment = requireMatchingString(config.environment, "environment", /[a-z0-9]{1,10}/, 'must match ^[a-z0-9]{1,10}$')
54
55
  ext.supersdkAppName = requireString(config.name, "name")
55
56
  if ((ext.supersdkAppName =~ /[\x00-\x1F]/).find() || ext.supersdkAppName != ext.supersdkAppName.trim()) {
56
57
  throw new GradleException("SuperSDK Android config invalid at ${configFile}: name must be a non-empty Android app label without control characters or edge whitespace")
@@ -1,5 +1,6 @@
1
1
  {
2
- "app_id": "Demo_App-01",
2
+ "spid": "demo0001",
3
+ "environment": "prod",
3
4
  "managed_by": "supersdk-template",
4
5
  "name": "SuperSDK Simple",
5
6
  "platform": "android",
@@ -8,7 +9,7 @@
8
9
  },
9
10
  "schema_version": 2,
10
11
  "sdk": {
11
- "androidVersion": "1.0.0.43-SNAPSHOT"
12
+ "androidVersion": "1.0.0.54-SNAPSHOT"
12
13
  },
13
14
  "version": {
14
15
  "code": 1,
@@ -1,10 +1,13 @@
1
+ import Foundation
2
+
1
3
  public protocol SuperSDKProvider: AnyObject {
2
4
  }
3
5
 
4
6
  public final class SuperSDKManager {
5
7
  public static let shared = SuperSDKManager()
6
8
 
7
- public private(set) var lastInitializedAid: String?
9
+ public private(set) var lastInitializedSpid: String?
10
+ public private(set) var lastInitializedEnvironment: String?
8
11
  public private(set) var lastProviderTypeName: String?
9
12
  public var lastProviderWasSet: Bool {
10
13
  lastProviderTypeName != nil
@@ -13,13 +16,26 @@ public final class SuperSDKManager {
13
16
  private init() {
14
17
  }
15
18
 
16
- public func initialize(aid: String, provider: SuperSDKProvider) {
17
- lastInitializedAid = aid
19
+ public func initialize(spid: String, environment: String = "prod", provider: SuperSDKProvider) throws {
20
+ guard spid.range(of: "^[a-z0-9]{8}$", options: .regularExpression) != nil else {
21
+ throw MockValidationError.invalidSpid
22
+ }
23
+ guard environment.range(of: "^[a-z0-9]{1,10}$", options: .regularExpression) != nil else {
24
+ throw MockValidationError.invalidEnvironment
25
+ }
26
+ lastInitializedSpid = spid
27
+ lastInitializedEnvironment = environment
18
28
  lastProviderTypeName = String(describing: type(of: provider))
19
29
  }
20
30
 
21
31
  public func resetForTesting() {
22
- lastInitializedAid = nil
32
+ lastInitializedSpid = nil
33
+ lastInitializedEnvironment = nil
23
34
  lastProviderTypeName = nil
24
35
  }
25
36
  }
37
+
38
+ public enum MockValidationError: Error {
39
+ case invalidSpid
40
+ case invalidEnvironment
41
+ }
@@ -6,7 +6,11 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
6
6
  _ application: UIApplication,
7
7
  didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
8
8
  ) -> Bool {
9
- SimpleSDKBootstrap.initialize()
9
+ do {
10
+ try SimpleSDKBootstrap.initialize()
11
+ } catch {
12
+ fatalError("SuperSDK init failed; check supersdk.yaml identity: \(error)")
13
+ }
10
14
  return true
11
15
  }
12
16
 
@@ -1,7 +1,11 @@
1
1
  import SuperSDK
2
2
 
3
3
  enum SimpleSDKBootstrap {
4
- static func initialize() {
5
- SuperSDKManager.shared.initialize(aid: SimpleConfig.appId, provider: SimpleSDKProvider())
4
+ static func initialize() throws {
5
+ try SuperSDKManager.shared.initialize(
6
+ spid: SimpleConfig.spid,
7
+ environment: SimpleConfig.environment,
8
+ provider: SimpleSDKProvider()
9
+ )
6
10
  }
7
11
  }
@@ -3,7 +3,8 @@ import SuperSDK
3
3
 
4
4
  struct SimpleSDKProbeResult {
5
5
  let resetClearedState: Bool
6
- let initializedAid: String?
6
+ let initializedSpid: String?
7
+ let initializedEnvironment: String?
7
8
  let providerWasSet: Bool
8
9
  let providerTypeName: String?
9
10
  }
@@ -11,13 +12,15 @@ struct SimpleSDKProbeResult {
11
12
  enum SimpleSDKProbe {
12
13
  static func resetAndInitializeForTesting() -> SimpleSDKProbeResult {
13
14
  SuperSDKManager.shared.resetForTesting()
14
- let resetClearedState = SuperSDKManager.shared.lastInitializedAid == nil
15
+ let resetClearedState = SuperSDKManager.shared.lastInitializedSpid == nil
16
+ && SuperSDKManager.shared.lastInitializedEnvironment == nil
15
17
  && !SuperSDKManager.shared.lastProviderWasSet
16
18
  && SuperSDKManager.shared.lastProviderTypeName == nil
17
- SimpleSDKBootstrap.initialize()
19
+ try! SimpleSDKBootstrap.initialize()
18
20
  return SimpleSDKProbeResult(
19
21
  resetClearedState: resetClearedState,
20
- initializedAid: SuperSDKManager.shared.lastInitializedAid,
22
+ initializedSpid: SuperSDKManager.shared.lastInitializedSpid,
23
+ initializedEnvironment: SuperSDKManager.shared.lastInitializedEnvironment,
21
24
  providerWasSet: SuperSDKManager.shared.lastProviderWasSet,
22
25
  providerTypeName: SuperSDKManager.shared.lastProviderTypeName
23
26
  )
@@ -7,7 +7,8 @@ final class SimpleSDKInitializationTests: XCTestCase {
7
7
  // SimpleSDKProbe is DEBUG-only; the SimpleApp test scheme intentionally runs this oracle in Debug.
8
8
  let result = SimpleSDKProbe.resetAndInitializeForTesting()
9
9
  XCTAssertTrue(result.resetClearedState)
10
- XCTAssertEqual(result.initializedAid, SimpleConfig.appId)
10
+ XCTAssertEqual(result.initializedSpid, SimpleConfig.spid)
11
+ XCTAssertEqual(result.initializedEnvironment, SimpleConfig.environment)
11
12
  XCTAssertTrue(result.providerWasSet)
12
13
  XCTAssertEqual(result.providerTypeName, "SimpleSDKProvider")
13
14
  #else
@@ -30,12 +30,12 @@ def quote(value):
30
30
 
31
31
 
32
32
  def swift_string(value):
33
- # json.dumps is a valid Swift string literal here because app_id is ASCII-restricted below.
33
+ # json.dumps is a valid Swift string literal here because spid is ASCII-restricted below.
34
34
  return json.dumps(str(value))
35
35
 
36
36
 
37
- def sanitize_app_id(app_id):
38
- value = re.sub(r"[^a-z0-9-]+", "-", app_id.lower())
37
+ def sanitize_spid(spid):
38
+ value = re.sub(r"[^a-z0-9-]+", "-", spid.lower())
39
39
  value = re.sub(r"-+", "-", value).strip("-")
40
40
  return value or "app"
41
41
 
@@ -97,9 +97,12 @@ if spm_mode == "real":
97
97
  if spm_mode != "mock":
98
98
  fail_invalid("platform_config.spmMode must be mock")
99
99
 
100
- app_id = managed.get("app_id")
101
- if not isinstance(app_id, str) or not re.fullmatch(template_contract.APP_ID_PATTERN, app_id):
102
- fail_invalid(f"app_id must match ^{template_contract.APP_ID_PATTERN}$")
100
+ spid = managed.get("spid")
101
+ if not isinstance(spid, str) or not re.fullmatch(template_contract.SPID_PATTERN, spid):
102
+ fail_invalid(f"spid must match ^{template_contract.SPID_PATTERN}$")
103
+ environment = managed.get("environment")
104
+ if not isinstance(environment, str) or not re.fullmatch(template_contract.ENVIRONMENT_PATTERN, environment):
105
+ fail_invalid(f"environment must match ^{template_contract.ENVIRONMENT_PATTERN}$")
103
106
  name = managed.get("name")
104
107
  if not isinstance(name, str) or not name:
105
108
  fail_invalid("name must be a non-empty string")
@@ -117,7 +120,7 @@ bundle_id = platform_config.get("bundleId")
117
120
  if bundle_id is not None:
118
121
  if not isinstance(bundle_id, str) or not re.fullmatch(template_contract.BUNDLE_ID_PATTERN, bundle_id):
119
122
  fail_invalid("platform_config.bundleId must be a bundle identifier")
120
- bundle_id = bundle_id or f"com.supersdk.simple.{sanitize_app_id(app_id)}"
123
+ bundle_id = bundle_id or f"com.supersdk.simple.{sanitize_spid(spid)}"
121
124
  mock_package = (ios_dir / "MockSuperSDKPackage").resolve()
122
125
  source_spec = ios_dir / "project.yml"
123
126
 
@@ -130,9 +133,10 @@ simple_config.write_text(
130
133
  """import Foundation
131
134
 
132
135
  enum SimpleConfig {
133
- static let appId = %s
136
+ static let spid = %s
137
+ static let environment = %s
134
138
  }
135
- """ % swift_string(app_id),
139
+ """ % (swift_string(spid), swift_string(environment)),
136
140
  encoding="utf-8",
137
141
  )
138
142