@comergehq/studio 0.1.13 → 0.1.15

package/dist/index.mjs

@@ -884,6 +884,7 @@ function useThreadMessages(threadId) {
 import * as React5 from "react";
 import * as FileSystem from "expo-file-system/legacy";
 import { Asset } from "expo-asset";
+import { unzip } from "react-native-zip-archive";
 
 // src/data/apps/bundles/remote.ts
 var BundlesRemoteDataSourceImpl = class extends BaseRemote {
@@ -907,6 +908,13 @@ var BundlesRemoteDataSourceImpl = class extends BaseRemote {
     );
     return data;
   }
+  async getSignedAssetsDownloadUrl(appId, bundleId, options) {
+    const { data } = await api.get(
+      `/v1/apps/${encodeURIComponent(appId)}/bundles/${encodeURIComponent(bundleId)}/assets/download`,
+      { params: { redirect: (options == null ? void 0 : options.redirect) ?? false, kind: options == null ? void 0 : options.kind } }
+    );
+    return data;
+  }
 };
 var bundlesRemoteDataSource = new BundlesRemoteDataSourceImpl();
 
@@ -928,6 +936,10 @@ var BundlesRepositoryImpl = class extends BaseRepository {
     const res = await this.remote.getSignedDownloadUrl(appId, bundleId, options);
     return this.unwrapOrThrow(res);
   }
+  async getSignedAssetsDownloadUrl(appId, bundleId, options) {
+    const res = await this.remote.getSignedAssetsDownloadUrl(appId, bundleId, options);
+    return this.unwrapOrThrow(res);
+  }
 };
 var bundlesRepository = new BundlesRepositoryImpl(bundlesRemoteDataSource);
 
@@ -979,20 +991,40 @@ async function ensureDir(path) {
   if (info.exists) return;
   await FileSystem.makeDirectoryAsync(path, { intermediates: true });
 }
+async function ensureBundleDir(key) {
+  await ensureDir(bundlesCacheDir());
+  await ensureDir(bundleDir(key));
+}
 function baseBundleKey(appId, platform) {
   return `base:${appId}:${platform}`;
 }
 function testBundleKey(appId, commitId, platform, bundleId) {
   return `test:${appId}:${commitId ?? "head"}:${platform}:${bundleId}`;
 }
-function toBundleFileUri(key) {
+function legacyBundleFileUri(key) {
   const dir = bundlesCacheDir();
   return `${dir}${safeName(key)}.jsbundle`;
 }
-function toBundleMetaFileUri(key) {
+function legacyBundleMetaFileUri(key) {
   const dir = bundlesCacheDir();
   return `${dir}${safeName(key)}.meta.json`;
 }
+function bundleDir(key) {
+  const dir = bundlesCacheDir();
+  return `${dir}${safeName(key)}/`;
+}
+function toBundleFileUri(key, platform) {
+  return `${bundleDir(key)}index.${platform}.jsbundle`;
+}
+function toBundleMetaFileUri(key) {
+  return `${bundleDir(key)}bundle.meta.json`;
+}
+function toAssetsMetaFileUri(key) {
+  return `${bundleDir(key)}assets.meta.json`;
+}
+function toAssetsDir(key) {
+  return `${bundleDir(key)}assets/`;
+}
 async function readJsonFile(fileUri) {
   try {
     const info = await FileSystem.getInfoAsync(fileUri);
@@ -1019,6 +1051,14 @@ async function getExistingNonEmptyFileUri(fileUri) {
     return null;
   }
 }
+async function getExistingBundleFileUri(key, platform) {
+  const nextPath = toBundleFileUri(key, platform);
+  const next = await getExistingNonEmptyFileUri(nextPath);
+  if (next) return next;
+  const legacyPath = legacyBundleFileUri(key);
+  const legacy = await getExistingNonEmptyFileUri(legacyPath);
+  return legacy;
+}
 async function downloadIfMissing(url, fileUri) {
   const existing = await getExistingNonEmptyFileUri(fileUri);
   if (existing) return existing;
@@ -1045,9 +1085,12 @@ async function deleteFileIfExists(fileUri) {
 async function hydrateBaseFromEmbeddedAsset(appId, platform, embedded) {
   if (!(embedded == null ? void 0 : embedded.module)) return null;
   const key = baseBundleKey(appId, platform);
-  const targetUri = toBundleFileUri(key);
-  const existing = await getExistingNonEmptyFileUri(targetUri);
-  if (existing) return { bundlePath: existing, meta: embedded.meta ?? null };
+  const existing = await getExistingBundleFileUri(key, platform);
+  if (existing) {
+    return { bundlePath: existing, meta: embedded.meta ?? null };
+  }
+  await ensureBundleDir(key);
+  const targetUri = toBundleFileUri(key, platform);
   const asset = Asset.fromModule(embedded.module);
   await asset.downloadAsync();
   const sourceUri = asset.localUri ?? asset.uri;
@@ -1060,8 +1103,50 @@ async function hydrateBaseFromEmbeddedAsset(appId, platform, embedded) {
   if (!finalUri) return null;
   return { bundlePath: finalUri, meta: embedded.meta ?? null };
 }
-async function safeReplaceFileFromUrl(url, targetUri, tmpKey) {
-  const tmpUri = toBundleFileUri(`tmp:${tmpKey}:${Date.now()}`);
+async function hydrateAssetsFromEmbeddedAsset(appId, platform, key, embedded) {
+  var _a;
+  const moduleId = embedded == null ? void 0 : embedded.assetsModule;
+  if (!moduleId) return false;
+  const assetsMeta = (embedded == null ? void 0 : embedded.assetsMeta) ?? null;
+  const assetsDir = toAssetsDir(key);
+  const metaUri = toAssetsMetaFileUri(key);
+  const existingMeta = await readJsonFile(metaUri);
+  const assetsDirInfo = await FileSystem.getInfoAsync(assetsDir);
+  const assetsDirExists = assetsDirInfo.exists && assetsDirInfo.isDirectory;
+  const checksumMatches = Boolean(existingMeta == null ? void 0 : existingMeta.checksumSha256) && Boolean(assetsMeta == null ? void 0 : assetsMeta.checksumSha256) && (existingMeta == null ? void 0 : existingMeta.checksumSha256) === (assetsMeta == null ? void 0 : assetsMeta.checksumSha256);
+  const embeddedMetaMatches = (_a = existingMeta == null ? void 0 : existingMeta.storageKey) == null ? void 0 : _a.startsWith("embedded:");
+  if (assetsDirExists && checksumMatches && embeddedMetaMatches) {
+    return true;
+  }
+  await ensureBundleDir(key);
+  await ensureDir(assetsDir);
+  const asset = Asset.fromModule(moduleId);
+  await asset.downloadAsync();
+  const sourceUri = asset.localUri ?? asset.uri;
+  if (!sourceUri) return false;
+  const info = await FileSystem.getInfoAsync(sourceUri);
+  if (!info.exists) return false;
+  const zipUri = `${bundleDir(key)}assets.zip`;
+  await deleteFileIfExists(zipUri);
+  await FileSystem.copyAsync({ from: sourceUri, to: zipUri });
+  try {
+    await FileSystem.deleteAsync(assetsDir, { idempotent: true }).catch(() => {
+    });
+  } catch {
+  }
+  await ensureDir(assetsDir);
+  await unzipArchive(zipUri, assetsDir);
+  await writeJsonFile(metaUri, {
+    checksumSha256: (assetsMeta == null ? void 0 : assetsMeta.checksumSha256) ?? null,
+    storageKey: `embedded:${(assetsMeta == null ? void 0 : assetsMeta.checksumSha256) ?? "unknown"}`,
+    updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+  });
+  return true;
+}
+async function safeReplaceFileFromUrl(url, targetUri, tmpKey, platform) {
+  const tmpKeySafe = `tmp:${tmpKey}:${Date.now()}`;
+  const tmpUri = toBundleFileUri(tmpKeySafe, platform);
+  await ensureDir(bundleDir(tmpKeySafe));
   try {
     await withRetry(
       async () => {
@@ -1081,6 +1166,82 @@ async function safeReplaceFileFromUrl(url, targetUri, tmpKey) {
     await deleteFileIfExists(tmpUri);
   }
 }
+async function safeReplaceFileFromUrlToPath(url, targetUri, tmpKey) {
+  const tmpDir = `${bundlesCacheDir()}tmp/`;
+  await ensureDir(tmpDir);
+  const tmpUri = `${tmpDir}${safeName(tmpKey)}.tmp`;
+  try {
+    await withRetry(
+      async () => {
+        await deleteFileIfExists(tmpUri);
+        await FileSystem.downloadAsync(url, tmpUri);
+        const tmpOk = await getExistingNonEmptyFileUri(tmpUri);
+        if (!tmpOk) throw new Error("Downloaded file is empty.");
+      },
+      { attempts: 3, baseDelayMs: 500, maxDelayMs: 4e3 }
+    );
+    await deleteFileIfExists(targetUri);
+    await FileSystem.moveAsync({ from: tmpUri, to: targetUri });
+    const finalOk = await getExistingNonEmptyFileUri(targetUri);
+    if (!finalOk) throw new Error("File replacement failed.");
+    return targetUri;
+  } finally {
+    await deleteFileIfExists(tmpUri);
+  }
+}
+function getMetroAssets(bundle) {
+  const assets = bundle.assets ?? [];
+  return assets.find((asset) => asset.kind === "metro-assets") ?? null;
+}
+async function ensureAssetsForBundle(appId, bundle, key, platform) {
+  var _a;
+  const asset = getMetroAssets(bundle);
+  if (!(asset == null ? void 0 : asset.storageKey)) return;
+  await ensureBundleDir(key);
+  const assetsDir = toAssetsDir(key);
+  await ensureDir(assetsDir);
+  const metaUri = toAssetsMetaFileUri(key);
+  const existingMeta = await readJsonFile(metaUri);
+  const assetsDirInfo = await FileSystem.getInfoAsync(assetsDir);
+  const assetsDirExists = assetsDirInfo.exists && assetsDirInfo.isDirectory;
+  if ((existingMeta == null ? void 0 : existingMeta.checksumSha256) && asset.checksumSha256 && existingMeta.checksumSha256 === asset.checksumSha256 && (existingMeta.storageKey === asset.storageKey || ((_a = existingMeta.storageKey) == null ? void 0 : _a.startsWith("embedded:"))) && assetsDirExists) {
+    return;
+  }
+  const signed = await withRetry(
+    async () => {
+      return await bundlesRepository.getSignedAssetsDownloadUrl(appId, bundle.id, {
+        redirect: false,
+        kind: asset.kind
+      });
+    },
+    { attempts: 3, baseDelayMs: 500, maxDelayMs: 4e3 }
+  );
+  const zipUri = `${bundleDir(key)}assets.zip`;
+  await safeReplaceFileFromUrlToPath(signed.url, zipUri, `${appId}:${bundle.id}:${platform}:${asset.kind}`);
+  try {
+    await FileSystem.deleteAsync(assetsDir, { idempotent: true }).catch(() => {
+    });
+  } catch {
+  }
+  await ensureDir(assetsDir);
+  await unzipArchive(zipUri, assetsDir);
+  await writeJsonFile(metaUri, {
+    checksumSha256: asset.checksumSha256 ?? null,
+    storageKey: asset.storageKey,
+    updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+  });
+}
+async function unzipArchive(sourceUri, destDir) {
+  try {
+    await unzip(sourceUri, destDir);
+  } catch (e) {
+    throw new Error(
+      `Failed to extract assets archive. Ensure 'react-native-zip-archive' is installed in the host app. ${String(
+        (e == null ? void 0 : e.message) ?? e
+      )}`
+    );
+  }
+}
 async function pollBundle(appId, bundleId, opts) {
   const start = Date.now();
   while (true) {
@@ -1116,18 +1277,33 @@ async function resolveBundlePath(src, platform, mode) {
   if (finalBundle.status === "failed") {
     throw new Error("Bundle build failed.");
   }
+  let bundleWithAssets = finalBundle;
+  if (finalBundle.status === "succeeded" && (!finalBundle.assets || finalBundle.assets.length === 0)) {
+    try {
+      bundleWithAssets = await bundlesRepository.getById(appId, finalBundle.id);
+    } catch {
+      bundleWithAssets = finalBundle;
+    }
+  }
   const signed = await withRetry(
     async () => {
       return await bundlesRepository.getSignedDownloadUrl(appId, finalBundle.id, { redirect: false });
     },
     { attempts: 3, baseDelayMs: 500, maxDelayMs: 4e3 }
   );
+  const key = mode === "base" ? baseBundleKey(appId, platform) : testBundleKey(appId, commitId, platform, finalBundle.id);
+  await ensureBundleDir(key);
   const bundlePath = mode === "base" ? await safeReplaceFileFromUrl(
     signed.url,
-    toBundleFileUri(baseBundleKey(appId, platform)),
-    `${appId}:${commitId ?? "head"}:${platform}:${finalBundle.id}`
-  ) : await downloadIfMissing(signed.url, toBundleFileUri(testBundleKey(appId, commitId, platform, finalBundle.id)));
-  return { bundlePath, label: "Ready", bundle: finalBundle };
+    toBundleFileUri(key, platform),
+    `${appId}:${commitId ?? "head"}:${platform}:${finalBundle.id}`,
+    platform
+  ) : await downloadIfMissing(signed.url, toBundleFileUri(key, platform));
+  try {
+    await ensureAssetsForBundle(appId, bundleWithAssets, key, platform);
+  } catch {
+  }
+  return { bundlePath, label: "Ready", bundle: bundleWithAssets };
 }
 function useBundleManager({
   base,
@@ -1168,13 +1344,12 @@ function useBundleManager({
   const hasCompletedFirstNetworkBaseLoadRef = React5.useRef(false);
   const hydrateBaseFromDisk = React5.useCallback(
     async (appId, reason) => {
-      var _a;
+      var _a, _b, _c;
       try {
         const dir = bundlesCacheDir();
         await ensureDir(dir);
         const key = baseBundleKey(appId, platform);
-        const uri = toBundleFileUri(key);
-        let existing = await getExistingNonEmptyFileUri(uri);
+        let existing = await getExistingBundleFileUri(key, platform);
         let embeddedMeta = null;
         if (!existing) {
           const embedded = (_a = embeddedBaseBundlesRef.current) == null ? void 0 : _a[platform];
@@ -1183,14 +1358,25 @@ function useBundleManager({
             existing = hydrated.bundlePath;
             embeddedMeta = hydrated.meta ?? null;
             if (embeddedMeta) {
+              await ensureBundleDir(key);
               await writeJsonFile(toBundleMetaFileUri(key), embeddedMeta);
+              await writeJsonFile(legacyBundleMetaFileUri(key), embeddedMeta);
             }
           }
         }
         if (existing) {
           lastBaseBundlePathRef.current = existing;
           setBundlePath(existing);
-          const meta = embeddedMeta ?? await readJsonFile(toBundleMetaFileUri(key));
+          const meta = embeddedMeta ?? await readJsonFile(toBundleMetaFileUri(key)) ?? await readJsonFile(legacyBundleMetaFileUri(key));
+          const embedded = (_b = embeddedBaseBundlesRef.current) == null ? void 0 : _b[platform];
+          const embeddedFingerprint = ((_c = embedded == null ? void 0 : embedded.meta) == null ? void 0 : _c.fingerprint) ?? null;
+          const actualFingerprint = (meta == null ? void 0 : meta.fingerprint) ?? (embeddedMeta == null ? void 0 : embeddedMeta.fingerprint) ?? null;
+          if ((embedded == null ? void 0 : embedded.assetsModule) && embeddedFingerprint && actualFingerprint === embeddedFingerprint) {
+            try {
+              await hydrateAssetsFromEmbeddedAsset(appId, platform, key, embedded);
+            } catch {
+            }
+          }
           if (meta == null ? void 0 : meta.fingerprint) {
             lastBaseFingerprintRef.current = meta.fingerprint;
           }
@@ -1255,7 +1441,16 @@ function useBundleManager({
         lastBaseFingerprintRef.current = fingerprint;
         hasCompletedFirstNetworkBaseLoadRef.current = true;
         initialHydratedBaseFromDiskRef.current = false;
-        void writeJsonFile(toBundleMetaFileUri(baseBundleKey(src.appId, platform)), {
+        const metaKey = baseBundleKey(src.appId, platform);
+        await ensureBundleDir(metaKey);
+        void writeJsonFile(toBundleMetaFileUri(metaKey), {
+          fingerprint,
+          bundleId: bundle.id,
+          checksumSha256: bundle.checksumSha256 ?? null,
+          size: bundle.size ?? null,
+          updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+        });
+        void writeJsonFile(legacyBundleMetaFileUri(metaKey), {
           fingerprint,
           bundleId: bundle.id,
           checksumSha256: bundle.checksumSha256 ?? null,