@imagina-build/ias-cli 0.2.0 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@imagina-build/ias-cli",
-    "version": "0.2.0",
+    "version": "0.2.1",
     "description": "The command line of Imagina Application Services (IAS): ias.json, OTA updates, internal distribution and the checks of a project.",
     "type": "module",
     "bin": {

package/src/commands/update/index.mjs

@@ -387,6 +387,12 @@ export async function check(settings, { platforms = PLATFORMS }, output) {
   return { checks };
 }
 
+/**
+ * The URL of a file the manifest points to, asked of the server this publication went to: a manifest may name any of
+ * the hosts the server answers for (the old domain, the new one), and they all serve the same path.
+ */
+const assetOf = (url, settings) => new URL(new URL(url, settings.manifestUrl).pathname, settings.base);
+
 /**
  * Asks for the manifest as a phone would and checks the signature, the id and every file it points to. `checked`
  * holds the files already checked in this run (one per settings): the platforms share most of them. `channel` and
@@ -418,7 +424,7 @@ export async function checkServed(settings, platform, runtime, expectedId, outpu
     checked.add(asset.hash);
     // Each file once, and the bundle also without gzip.
     for (const encoding of index === 0 ? [undefined, 'identity'] : [undefined]) {
-      const answer = await download(new URL(asset.url, settings.manifestUrl), encoding ? { 'accept-encoding': encoding } : {}, output);
+      const answer = await download(assetOf(asset.url, settings), encoding ? { 'accept-encoding': encoding } : {}, output);
       if (!answer.ok) throw new Error(`${platform}: ${asset.url} answered ${answer.status}`);
       if (sha256(Buffer.from(await answer.arrayBuffer())) !== asset.hash) throw new Error(`${platform}: ${asset.url} does not match its hash`);
     }

package/src/config.mjs

@@ -163,7 +163,7 @@ function iasUpdateSettings({ dir, config }, env) {
     manifestUrl: manifestUrl.href,
     base,
     project: manifestUrl.pathname.match(MANIFEST_PATH)[1],
-    assetPath: `${new URL(base).pathname}/assets/`,
+    assetPath: `${base}/assets/`,
     keyid,
     certificate: new X509Certificate(readFileSync(certificateFile)),
     signingSource: appCertificate ? 'app.json' : 'updates.signing of ias.json',
@@ -203,7 +203,7 @@ function legacyUpdateSettings(projectDir, env) {
     manifestUrl: manifestUrl.href,
     base,
     project: manifestUrl.pathname.match(MANIFEST_PATH)[1],
-    assetPath: `${new URL(base).pathname}/assets/`,
+    assetPath: `${base}/assets/`,
     keyid: updates.codeSigningMetadata.keyid,
     certificate,
     privateKey,

package/src/ota.mjs

@@ -30,9 +30,10 @@ export function readEnvFile(path, names) {
 }
 
 /**
- * One manifest per platform from an expo export folder: the same createdAt, the runtime of each platform, relative
- * asset URLs, metadata {} (filters could make phones load an older update) and the public config as extra.expoClient.
- * Returns the manifests and the files to upload, by hash. Throws if a bundle lacks a value it must carry.
+ * One manifest per platform from an expo export folder: the same createdAt, the runtime of each platform, absolute
+ * asset URLs (the released expo-updates clients do not resolve relative ones), metadata {} (filters could make phones
+ * load an older update) and the public config as extra.expoClient. Returns the manifests and the files to upload, by
+ * hash. Throws if a bundle lacks a value it must carry.
  */
 export function buildManifests({ dist, metadata, platforms, runtimes, expoClient, assetPath, createdAt, mustContain = [] }) {
   const files = new Map();