react-native-update 10.37.13 → 10.37.15

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "react-native-update",
-  "version": "10.37.13",
+  "version": "10.37.15",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {
+    "prepublishOnly": "NODE_ENV=production bun scripts/prepublish.ts",
     "postinstall": "node scripts/check-expo-version.js",
     "prepack": "bun submodule && bun lint",
     "lint": "eslint \"src/*.@(ts|tsx|js|jsx)\" && tsc --noEmit",
@@ -12,12 +13,12 @@
     "build:so": "bun submodule && $ANDROID_HOME/ndk/28.2.13676358/ndk-build NDK_PROJECT_PATH=android APP_BUILD_SCRIPT=android/jni/Android.mk NDK_APPLICATION_MK=android/jni/Application.mk NDK_LIBS_OUT=android/lib",
     "build:ios-debug": "cd Example/testHotUpdate && bun && detox build --configuration ios.sim.debug",
     "build:ios-release": "cd Example/testHotUpdate && bun && detox build --configuration ios.sim.release",
-    "test:ios-debug": "cd Example/testHotUpdate && detox test --configuration ios.sim.debug",
-    "test:ios-release": "cd Example/testHotUpdate && bun detox test --configuration ios.sim.release",
+    "test:ios-debug": "cd Example/testHotUpdate && E2E_PLATFORM=ios detox test --configuration ios.sim.debug",
+    "test:ios-release": "cd Example/testHotUpdate && E2E_PLATFORM=ios bun detox test --configuration ios.sim.release",
     "build:android-debug": "cd Example/testHotUpdate && bun && detox build --configuration android.emu.debug",
     "build:android-release": "cd Example/testHotUpdate && bun && detox build --configuration android.emu.release",
-    "test:android-release": "cd Example/testHotUpdate && bun detox test --configuration android.emu.release --headless --record-logs all",
-    "test:android-debug": "cd Example/testHotUpdate && detox test --configuration android.emu.debug --headless --record-logs all",
+    "test:android-release": "cd Example/testHotUpdate && E2E_PLATFORM=android bun detox test --configuration android.emu.release --headless --record-logs all",
+    "test:android-debug": "cd Example/testHotUpdate && E2E_PLATFORM=android detox test --configuration android.emu.debug --headless --record-logs all",
     "e2e:ios": "bun build:ios-release && bun test:ios-release",
     "e2e:android": "bun build:android-release && bun test:android-release",
     "tests:emulator:prepare": "cd .github/workflows/scripts/functions && bun && bun build",
@@ -59,6 +60,7 @@
     "@react-native/babel-preset": "^0.73.21",
     "@react-native/eslint-config": "0.79.1",
     "@react-native/typescript-config": "0.79.1",
+    "@types/bun": "^1.3.7",
     "@types/jest": "^29.5.14",
     "@types/node": "^22.15.2",
     "@types/react": "^18.3.11",
@@ -73,4 +75,4 @@
     "ts-jest": "^29.3.2",
     "typescript": "^5.6.3"
   }
-}
+}

package/scripts/prepublish.ts

@@ -0,0 +1,51 @@
+#!/usr/bin/env bun
+
+import { access, readFile, writeFile } from 'node:fs/promises';
+import path from 'node:path';
+import { $ } from 'bun';
+
+async function modifyPackageJson({
+  version,
+}: {
+  version: string;
+}): Promise<void> {
+  const packageJsonPath = path.join(__dirname, '..', 'package.json');
+
+  try {
+    await access(packageJsonPath);
+  } catch {
+    throw new Error(`package.json not found at ${packageJsonPath}`);
+  }
+
+  console.log('Reading package.json...');
+  const packageJsonContent = await readFile(packageJsonPath, 'utf-8');
+  const packageJson = JSON.parse(packageJsonContent);
+
+  packageJson.version = version;
+
+  console.log('Writing modified package.json...');
+
+  await writeFile(
+    packageJsonPath,
+    JSON.stringify(packageJson, null, 2),
+    'utf-8',
+  );
+
+  console.log('package.json has been modified for publishing');
+}
+
+async function main(): Promise<void> {
+  const version = (await $`git describe --tags --always`.text())
+    .replace('v', '')
+    .trim();
+  try {
+    await modifyPackageJson({ version });
+    console.log('✅ Prepublish script completed successfully');
+  } catch (error) {
+    console.error('❌ Prepublish script failed:', error);
+    process.exit(1);
+  }
+
+}
+
+main();

package/scripts/read.js

@@ -0,0 +1,188 @@
+const fs = require('fs');
+
+/**
+ * 从 Hermes 字节码文件中读取 metadata
+ * 支持两种方式：
+ * 1. 从文件末尾的自定义 Meta 块读取（新方式，推荐）
+ * 2. 从 Hermes -meta 参数注入的数据读取（旧方式，备用）
+ */
+function readBundleMetadata(filePath) {
+  const buffer = fs.readFileSync(filePath);
+
+  // 优先尝试从文件末尾的自定义 Meta 块读取
+  const metaFromFooter = readMetadataFromHBCFooter(buffer);
+  if (metaFromFooter) {
+    return metaFromFooter;
+  }
+
+  // 如果末尾没有 Meta 块，尝试从 Hermes -meta 参数注入的数据读取（备用方案）
+  console.log('No metadata footer found, trying to read from Hermes -meta parameter...');
+  return readMetadataFromHermesMeta(buffer);
+}
+
+/**
+ * 从 HBC 文件末尾的自定义 Meta 块读取元数据
+ * 格式: [原始HBC][MAGIC_START][LENGTH][JSON_DATA][MAGIC_END]
+ */
+function readMetadataFromHBCFooter(buffer) {
+  const MAGIC = Buffer.from('RNUPDATE', 'utf8'); // 8 bytes
+  const MAGIC_SIZE = 8;
+  const LENGTH_SIZE = 4;
+
+  console.log(`\n[DEBUG] Reading metadata from HBC footer...`);
+  console.log(`[DEBUG] File size: ${buffer.length} bytes`);
+  console.log(`[DEBUG] Last 100 bytes (hex): ${buffer.slice(-100).toString('hex')}`);
+  console.log(`[DEBUG] Last 50 bytes (utf8): ${buffer.slice(-50).toString('utf8', 0, 50).replace(/[^\x20-\x7E]/g, '.')}`);
+
+  // 检查文件是否足够大以包含 meta 块
+  // 最小大小: MAGIC_START(8) + LENGTH(4) + JSON(至少2字节"{}") + MAGIC_END(8) = 22 bytes
+  if (buffer.length < 22) {
+    console.log(`[DEBUG] File too small: ${buffer.length} < 22`);
+    return null;
+  }
+
+  // 从文件末尾向前查找最后一个 MAGIC_END
+  const lastMagicIndex = buffer.lastIndexOf(MAGIC);
+
+  console.log(`[DEBUG] MAGIC string: "${MAGIC.toString('utf8')}"`);
+  console.log(`[DEBUG] Last MAGIC index: ${lastMagicIndex}`);
+
+  if (lastMagicIndex === -1) {
+    console.log(`[DEBUG] MAGIC not found in file`);
+    return null;
+  }
+
+  // MAGIC_END 应该在文件末尾
+  console.log(`[DEBUG] Expected MAGIC_END at: ${buffer.length - MAGIC_SIZE}`);
+  console.log(`[DEBUG] Found MAGIC_END at: ${lastMagicIndex}`);
+
+  if (lastMagicIndex + MAGIC_SIZE !== buffer.length) {
+    console.warn(`⚠️  Found MAGIC but not at file end (expected ${buffer.length - MAGIC_SIZE}, found ${lastMagicIndex})`);
+    return null;
+  }
+
+  // 计算 MAGIC_START 的位置
+  // 从 MAGIC_END 向前：MAGIC_END(8) + JSON(?) + LENGTH(4) + MAGIC_START(8)
+  const magicEndStart = lastMagicIndex;
+
+  // 读取长度字段（在 MAGIC_END 之前的 4 字节）
+  const lengthStart = magicEndStart - LENGTH_SIZE;
+  if (lengthStart < MAGIC_SIZE) {
+    console.log(`[DEBUG] lengthStart too small: ${lengthStart} < ${MAGIC_SIZE}`);
+    return null; // 文件太小
+  }
+
+  const jsonLength = buffer.readUInt32LE(lengthStart);
+  console.log(`[DEBUG] JSON length from buffer: ${jsonLength}`);
+
+  // 验证长度是否合理（JSON 数据应该小于 10KB）
+  if (jsonLength > 10240 || jsonLength < 2) {
+    console.warn(`⚠️  Invalid JSON length: ${jsonLength}`);
+    return null;
+  }
+
+  // 计算 JSON 数据的起始位置
+  const jsonStart = lengthStart - jsonLength;
+  console.log(`[DEBUG] JSON start position: ${jsonStart}`);
+  if (jsonStart < MAGIC_SIZE) {
+    console.log(`[DEBUG] jsonStart too small: ${jsonStart} < ${MAGIC_SIZE}`);
+    return null;
+  }
+
+  // 验证 MAGIC_START
+  const magicStartPos = jsonStart - MAGIC_SIZE;
+  console.log(`[DEBUG] MAGIC_START position: ${magicStartPos}`);
+  const magicStart = buffer.slice(magicStartPos, jsonStart);
+  console.log(`[DEBUG] MAGIC_START bytes: ${magicStart.toString('hex')}`);
+  console.log(`[DEBUG] Expected MAGIC bytes: ${MAGIC.toString('hex')}`);
+
+  if (!magicStart.equals(MAGIC)) {
+    console.warn('⚠️  MAGIC_START mismatch');
+    console.warn(`    Expected: ${MAGIC.toString('hex')}`);
+    console.warn(`    Got: ${magicStart.toString('hex')}`);
+    return null;
+  }
+
+  // 读取 JSON 数据
+  try {
+    const jsonBuffer = buffer.slice(jsonStart, lengthStart);
+    const jsonString = jsonBuffer.toString('utf8');
+    console.log(`[DEBUG] JSON string: ${jsonString}`);
+    const metadata = JSON.parse(jsonString);
+
+    console.log(`✅ Found metadata in HBC footer: contentHash=${metadata.contentHash?.slice(0, 16)}...`);
+    console.log(`   Metadata: ${JSON.stringify(metadata, null, 2)}`);
+
+    return metadata;
+  } catch (error) {
+    console.error('❌ Failed to parse metadata JSON:', error);
+    return null;
+  }
+}
+
+/**
+ * 从 Hermes -meta 参数注入的数据读取（备用方案）
+ */
+function readMetadataFromHermesMeta(buffer) {
+  const metadata = {};
+  const searchPattern = Buffer.from('contentHash=', 'utf8');
+
+  // 在整个文件中查找模式
+  let index = buffer.indexOf(searchPattern);
+
+  if (index !== -1) {
+    // 找到了 "contentHash="，读取后面的 hash 值
+    const hashStart = index + searchPattern.length;
+
+    // Hash 应该是 64 个十六进制字符 (SHA256)
+    let hashEnd = hashStart;
+    while (hashEnd < buffer.length && hashEnd < hashStart + 64) {
+      const byte = buffer[hashEnd];
+      // 检查是否是有效的十六进制字符 (0-9, a-f, A-F)
+      if ((byte >= 48 && byte <= 57) ||   // 0-9
+          (byte >= 97 && byte <= 102) ||  // a-f
+          (byte >= 65 && byte <= 70)) {   // A-F
+        hashEnd++;
+      } else {
+        break;
+      }
+    }
+
+    if (hashEnd > hashStart) {
+      metadata.contentHash = buffer.toString('utf8', hashStart, hashEnd);
+      console.log(`✅ Found contentHash in Hermes -meta: ${metadata.contentHash.slice(0, 16)}...`);
+    }
+  } else {
+    console.warn('⚠️  contentHash not found in Hermes -meta parameter');
+  }
+
+  return metadata;
+}
+
+/**
+ * 从普通 JS bundle 的注释中读取 metadata
+ */
+function readMetadataFromJSBundle(buffer) {
+  const content = buffer.toString('utf8');
+  const metadata = {};
+
+  // 查找 //# BUNDLE_METADATA {...} 注释
+  const metaMatch = content.match(/\/\/# BUNDLE_METADATA\s+(\{[^}]+\})/);
+  if (metaMatch) {
+    try {
+      const metaObj = JSON.parse(metaMatch[1]);
+      metadata.contentHash = metaObj.contentHash;
+      console.log(`✅ Found contentHash in JS bundle comment: ${metadata.contentHash.slice(0, 16)}...`);
+    } catch (e) {
+      console.error('Failed to parse BUNDLE_METADATA comment:', e);
+    }
+  } else {
+    console.warn('⚠️  BUNDLE_METADATA comment not found in JS bundle');
+  }
+
+  return metadata;
+}
+
+// 测试读取
+const metadata = readBundleMetadata('./index.bundlejs');
+console.log('Final metadata:', metadata);

package/src/client.ts

@@ -323,9 +323,10 @@ export class Pushy {
       this.throwIfEnabled(Error('errorChecking: ' + errorMessage));
       return this.lastRespJson ? await this.lastRespJson : emptyObj;
     }
-    this.lastRespJson = resp.json();
+    const respJsonPromise = resp.json() as Promise<CheckResult>;
+    this.lastRespJson = respJsonPromise;
 
-    const result: CheckResult = await this.lastRespJson;
+    const result: CheckResult = await respJsonPromise;
 
     log('checking result:', result);