@scalebun/cli 2.0.5 → 2.0.7

package/lib/utils/trustAnchor.js

@@ -33,22 +33,28 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ANDROID_ANCHOR_RELATIVE = void 0;
+exports.IOS_ANCHOR_FILENAME = exports.ANDROID_ANCHOR_RELATIVE = void 0;
 exports.writeAndroidTrustAnchor = writeAndroidTrustAnchor;
+exports.findXcodeProject = findXcodeProject;
+exports.iosAppSourceDir = iosAppSourceDir;
+exports.isInXcodeResources = isInXcodeResources;
+exports.writeIosTrustAnchor = writeIosTrustAnchor;
 exports.hasAndroidProject = hasAndroidProject;
+exports.hasIosProject = hasIosProject;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 exports.ANDROID_ANCHOR_RELATIVE = path.join('android', 'app', 'src', 'main', 'assets', 'scalebun_ota_keys.json');
+/** `ScaleBunOtaKeyRegistry.defaultResource` + ".json", on the iOS side. */
+exports.IOS_ANCHOR_FILENAME = 'ScaleBunOtaKeys.json';
 /**
- * Add a key to the Android trust anchor, creating the file if needed.
+ * Add a key to an anchor file, creating it if needed.
  *
  * Merges rather than overwrites: during a rotation two keys are valid at once,
  * and clobbering the old one strands every device still running the previous
  * build — they would refuse the next release and have no way back. A key with
  * the same keyId is replaced in place so re-running is idempotent.
  */
-function writeAndroidTrustAnchor(opts) {
-    const anchorPath = path.join(opts.cwd, exports.ANDROID_ANCHOR_RELATIVE);
+function writeAnchorAt(anchorPath, opts) {
     fs.mkdirSync(path.dirname(anchorPath), { recursive: true });
     let keys = [];
     let merged = false;
@@ -72,6 +78,82 @@ function writeAndroidTrustAnchor(opts) {
     fs.writeFileSync(anchorPath, JSON.stringify(anchor, null, 2) + '\n');
     return { path: anchorPath, keyIds: keys.map((k) => k.keyId), merged };
 }
+function writeAndroidTrustAnchor(opts) {
+    return writeAnchorAt(path.join(opts.cwd, exports.ANDROID_ANCHOR_RELATIVE), opts);
+}
+/** `ios/<App>.xcodeproj`, or null when there is no iOS project here. */
+function findXcodeProject(cwd) {
+    const iosDir = path.join(cwd, 'ios');
+    if (!fs.existsSync(iosDir))
+        return null;
+    const proj = fs.readdirSync(iosDir).find((name) => name.endsWith('.xcodeproj'));
+    return proj ? path.join(iosDir, proj) : null;
+}
+/**
+ * The folder the app's own sources live in — `ios/<App>/`.
+ *
+ * Xcode groups mirror the filesystem here by React Native convention, so that
+ * is where a new resource belongs if it is going to be easy to add to the
+ * target. Falls back to whichever folder holds the AppDelegate, for projects
+ * renamed away from their directory.
+ */
+function iosAppSourceDir(cwd) {
+    const proj = findXcodeProject(cwd);
+    if (!proj)
+        return null;
+    const iosDir = path.join(cwd, 'ios');
+    const byName = path.join(iosDir, path.basename(proj, '.xcodeproj'));
+    if (fs.existsSync(byName) && fs.statSync(byName).isDirectory())
+        return byName;
+    for (const entry of fs.readdirSync(iosDir)) {
+        const dir = path.join(iosDir, entry);
+        if (!fs.existsSync(dir) || !fs.statSync(dir).isDirectory())
+            continue;
+        const hasDelegate = fs
+            .readdirSync(dir)
+            .some((f) => /^AppDelegate\.(swift|mm?|h)$/.test(f));
+        if (hasDelegate)
+            return dir;
+    }
+    return null;
+}
+/**
+ * Is the anchor already referenced by the Xcode project?
+ *
+ * A substring check over project.pbxproj rather than a real parse: the question
+ * is only "has anyone added this filename", and erring toward "no" costs one
+ * extra printing of the instructions.
+ */
+function isInXcodeResources(cwd) {
+    const proj = findXcodeProject(cwd);
+    if (!proj)
+        return false;
+    const pbx = path.join(proj, 'project.pbxproj');
+    if (!fs.existsSync(pbx))
+        return false;
+    try {
+        return fs.readFileSync(pbx, 'utf8').includes(exports.IOS_ANCHOR_FILENAME);
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Add a key to the iOS trust anchor, creating the file if needed.
+ *
+ * Writes into `ios/<App>/` and reports whether the project references it yet.
+ * Adding it to the target is left to the caller: that means editing
+ * project.pbxproj, and a corrupted pbxproj costs far more than the single drag
+ * it would save.
+ */
+function writeIosTrustAnchor(opts) {
+    const dir = iosAppSourceDir(opts.cwd);
+    if (!dir) {
+        throw new Error('No ios/<App> source directory found — is this a React Native project with a native iOS app?');
+    }
+    const res = writeAnchorAt(path.join(dir, exports.IOS_ANCHOR_FILENAME), opts);
+    return { ...res, inXcodeResources: isInXcodeResources(opts.cwd) };
+}
 /**
  * Does this look like a native Android project we can write into? Used to skip
  * the anchor with a clear message instead of scattering directories into
@@ -80,4 +162,8 @@ function writeAndroidTrustAnchor(opts) {
 function hasAndroidProject(cwd) {
     return fs.existsSync(path.join(cwd, 'android', 'app'));
 }
+/** The iOS counterpart: an `ios/` folder with an actual Xcode project in it. */
+function hasIosProject(cwd) {
+    return iosAppSourceDir(cwd) !== null;
+}
 //# sourceMappingURL=trustAnchor.js.map

package/lib/utils/trustAnchor.js.map

@@ -1 +1 @@
-{"version":3,"file":"trustAnchor.js","sourceRoot":"","sources":["../../src/utils/trustAnchor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgDA,0DAkCC;AAOD,8CAEC;AA3FD,uCAAyB;AACzB,2CAA6B;AAsBhB,QAAA,uBAAuB,GAAG,IAAI,CAAC,IAAI,CAC9C,SAAS,EACT,KAAK,EACL,KAAK,EACL,MAAM,EACN,QAAQ,EACR,wBAAwB,CACzB,CAAC;AAUF;;;;;;;GAOG;AACH,SAAgB,uBAAuB,CAAC,IAKvC;IACC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,+BAAuB,CAAC,CAAC;IAChE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE5D,IAAI,IAAI,GAAwB,EAAE,CAAC;IACnC,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC9B,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAyB,CAAC;YACzF,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC;gBAClC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CACzB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,KAAK,KAAK,QAAQ,IAAI,OAAO,CAAC,CAAC,SAAS,KAAK,QAAQ,CAC3E,CAAC;gBACF,MAAM,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,sEAAsE;YACtE,mEAAmE;YACnE,IAAI,GAAG,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;IAED,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC;IAClD,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAEtE,MAAM,MAAM,GAAgB,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC;IAChE,EAAE,CAAC,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAErE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;AACxE,CAAC;AAED;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,GAAW;IAC3C,OAAO,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;AACzD,CAAC"}
+{"version":3,"file":"trustAnchor.js","sourceRoot":"","sources":["../../src/utils/trustAnchor.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scalebun/cli",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "description": "Scalebun CLI — OTA bundle publishing and management",
   "license": "MIT",
   "bin": {