ubriot-updates-rn 0.1.0 → 0.1.4

package/android/src/main/java/dev/ubriot/updates/UbriotUpdatesModule.kt

@@ -23,6 +23,7 @@ class UbriotUpdateState(
   var pending: UbriotUpdateEntry? = null,
   var lastKnownGood: UbriotUpdateEntry? = null,
   var launchCount: Int = 0,
+  var revertedFromId: String? = null,
 )
 
 class UbriotUpdatesModule(
@@ -124,6 +125,18 @@ class UbriotUpdatesModule(
     }
   }
 
+  @ReactMethod
+  fun clearRevertedFrom(promise: Promise) {
+    try {
+      val state = readState(filesDir())
+      state.revertedFromId = null
+      writeState(filesDir(), state)
+      promise.resolve(null)
+    } catch (error: Throwable) {
+      promise.reject("ubriot_updates_clear_reverted_failed", error)
+    }
+  }
+
   @ReactMethod
   fun reload(promise: Promise) {
     try {
@@ -150,6 +163,7 @@ class UbriotUpdatesModule(
     map.putMap("pending", entryToWritableMap(state.pending))
     map.putMap("lastKnownGood", entryToWritableMap(state.lastKnownGood))
     map.putInt("launchCount", state.launchCount)
+    map.putString("revertedFromId", state.revertedFromId)
     return map
   }
 
@@ -200,6 +214,7 @@ class UbriotUpdatesModule(
           pending = entryFromJson(json.optJSONObject("pending")),
           lastKnownGood = entryFromJson(json.optJSONObject("lastKnownGood")),
           launchCount = json.optInt("launchCount", 0),
+          revertedFromId = json.optString("revertedFromId", "").ifEmpty { null },
         )
       } catch (_: Throwable) {
         UbriotUpdateState()
@@ -218,6 +233,7 @@ class UbriotUpdatesModule(
           .put("pending", entryToJson(state.pending))
           .put("lastKnownGood", entryToJson(state.lastKnownGood))
           .put("launchCount", state.launchCount)
+          .put("revertedFromId", state.revertedFromId ?: JSONObject.NULL)
         stateFile(filesDir).writeText(json.toString())
       } catch (_: Throwable) {
       }
@@ -241,6 +257,7 @@ class UbriotUpdatesModule(
             writeState(filesDir, state)
             return active.bundlePath
           }
+          state.revertedFromId = active.id
           state.active = null
           state.verified = false
           state.launchCount = 0

package/dist/index.d.ts

@@ -15,6 +15,7 @@ export type ApplyOptions = {
     restart?: boolean;
 };
 export type SyncResult = "up-to-date" | "updated";
+export type LaunchOutcome = "launched" | "crashed";
 export declare function configure(next: UbriotUpdatesConfig): void;
 export declare function checkForUpdate(): Promise<UpdateCheckResult>;
 export declare function downloadUpdate(): Promise<DownloadResult>;

package/dist/index.js

@@ -8,6 +8,7 @@ exports.sync = sync;
 exports.markLaunchSuccessful = markLaunchSuccessful;
 const react_native_1 = require("react-native");
 const MANIFEST_PATH = "/ubriot/updates/manifest";
+const LAUNCH_PATH = "/ubriot/updates/launch";
 let config = null;
 let stagedManifest = null;
 function getNativeModule() {
@@ -32,6 +33,60 @@ function normalizeBase(apiBase) {
 async function verifyManifestSignature(_manifest) {
     return true;
 }
+function reportLaunch(outcome, updateId) {
+    try {
+        if (!config)
+            return;
+        if (!updateId)
+            return;
+        const cfg = config;
+        const payload = JSON.stringify({
+            appId: cfg.appSlug,
+            channel: cfg.channel,
+            updateId,
+            platform: currentPlatform(),
+            outcome,
+        });
+        void fetch(`${cfg.apiBase}${LAUNCH_PATH}`, {
+            method: "POST",
+            headers: { "content-type": "application/json" },
+            body: payload,
+        }).catch(() => { });
+    }
+    catch { }
+}
+function reportRevertIfCrashed() {
+    try {
+        const native = react_native_1.NativeModules.UbriotUpdates;
+        if (!native || typeof native.getState !== "function")
+            return;
+        native
+            .getState()
+            .then((state) => {
+            var _a, _b, _c, _d, _e, _f;
+            try {
+                if (!state)
+                    return;
+                const revertedFromId = (_c = (_b = (_a = state.revertedFromId) !== null && _a !== void 0 ? _a : state.failedUpdateId) !== null && _b !== void 0 ? _b : state.lastRevertedId) !== null && _c !== void 0 ? _c : null;
+                if (!revertedFromId)
+                    return;
+                const survivingId = (_f = (_d = state.runningId) !== null && _d !== void 0 ? _d : (_e = state.active) === null || _e === void 0 ? void 0 : _e.id) !== null && _f !== void 0 ? _f : null;
+                if (revertedFromId === survivingId)
+                    return;
+                reportLaunch("crashed", revertedFromId);
+                try {
+                    if (typeof native.clearRevertedFrom === "function") {
+                        native.clearRevertedFrom().catch(() => { });
+                    }
+                }
+                catch { }
+            }
+            catch { }
+        })
+            .catch(() => { });
+    }
+    catch { }
+}
 function configure(next) {
     config = {
         apiBase: normalizeBase(next.apiBase),
@@ -39,6 +94,7 @@ function configure(next) {
         channel: next.channel,
         runtimeVersion: next.runtimeVersion,
     };
+    reportRevertIfCrashed();
 }
 async function checkForUpdate() {
     var _a, _b, _c, _d;
@@ -150,6 +206,10 @@ function markLaunchSuccessful() {
         const native = react_native_1.NativeModules.UbriotUpdates;
         if (native && typeof native.markLaunchSuccessful === "function") {
             native.markLaunchSuccessful().catch(() => { });
+            native
+                .getState()
+                .then((state) => { var _a, _b, _c; return reportLaunch("launched", (_c = (_a = state === null || state === void 0 ? void 0 : state.runningId) !== null && _a !== void 0 ? _a : (_b = state === null || state === void 0 ? void 0 : state.active) === null || _b === void 0 ? void 0 : _b.id) !== null && _c !== void 0 ? _c : null); })
+                .catch(() => { });
         }
     }
     catch {

package/ios/UbriotUpdates.m

@@ -36,6 +36,7 @@ RCT_EXPORT_MODULE();
     @"pending": [NSNull null],
     @"lastKnownGood": [NSNull null],
     @"launchCount": @0,
+    @"revertedFromId": [NSNull null],
   } mutableCopy];
 }
 
@@ -94,6 +95,7 @@ RCT_EXPORT_MODULE();
           [self writeState:state];
           return [NSURL fileURLWithPath:path];
         }
+        state[@"revertedFromId"] = activeId ?: [NSNull null];
         state[@"active"] = [NSNull null];
         state[@"verified"] = @NO;
         state[@"launchCount"] = @0;
@@ -214,6 +216,17 @@ RCT_EXPORT_METHOD(markLaunchSuccessful:(RCTPromiseResolveBlock)resolve rejecter:
   }
 }
 
+RCT_EXPORT_METHOD(clearRevertedFrom:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+  @try {
+    NSMutableDictionary *state = [UbriotUpdates readState];
+    state[@"revertedFromId"] = [NSNull null];
+    [UbriotUpdates writeState:state];
+    resolve(nil);
+  } @catch (NSException *exception) {
+    reject(@"ubriot_updates_clear_reverted_failed", exception.reason, nil);
+  }
+}
+
 RCT_EXPORT_METHOD(reload:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
   dispatch_async(dispatch_get_main_queue(), ^{
     @try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ubriot-updates-rn",
-  "version": "0.1.0",
+  "version": "0.1.4",
   "description": "Ubriot over-the-air JS update client for bare React Native (iOS + Android)",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/index.ts

@@ -34,14 +34,20 @@ type NativeState = {
   pending: NativeEntry;
   lastKnownGood: NativeEntry;
   launchCount: number;
+  revertedFromId?: string | null;
+  failedUpdateId?: string | null;
+  lastRevertedId?: string | null;
 };
 
+export type LaunchOutcome = "launched" | "crashed";
+
 type NativeUbriotUpdates = {
   getState(): Promise<NativeState>;
   downloadBundle(url: string, manifestId: string): Promise<{ ready: boolean; bundlePath: string }>;
   applyPending(): Promise<void>;
   markLaunchSuccessful(): Promise<void>;
   reload(): Promise<void>;
+  clearRevertedFrom?(): Promise<void>;
 };
 
 type LaunchManifest = {
@@ -50,6 +56,7 @@ type LaunchManifest = {
 };
 
 const MANIFEST_PATH = "/ubriot/updates/manifest";
+const LAUNCH_PATH = "/ubriot/updates/launch";
 
 let config: UbriotUpdatesConfig | null = null;
 let stagedManifest: LaunchManifest | null = null;
@@ -81,6 +88,52 @@ async function verifyManifestSignature(_manifest: unknown): Promise<boolean> {
   return true;
 }
 
+function reportLaunch(outcome: LaunchOutcome, updateId: string | null | undefined): void {
+  try {
+    if (!config) return;
+    if (!updateId) return;
+    const cfg = config;
+    const payload = JSON.stringify({
+      appId: cfg.appSlug,
+      channel: cfg.channel,
+      updateId,
+      platform: currentPlatform(),
+      outcome,
+    });
+    void fetch(`${cfg.apiBase}${LAUNCH_PATH}`, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: payload,
+    }).catch(() => {});
+  } catch {}
+}
+
+function reportRevertIfCrashed(): void {
+  try {
+    const native = NativeModules.UbriotUpdates as NativeUbriotUpdates | undefined;
+    if (!native || typeof native.getState !== "function") return;
+    native
+      .getState()
+      .then((state) => {
+        try {
+          if (!state) return;
+          const revertedFromId =
+            state.revertedFromId ?? state.failedUpdateId ?? state.lastRevertedId ?? null;
+          if (!revertedFromId) return;
+          const survivingId = state.runningId ?? state.active?.id ?? null;
+          if (revertedFromId === survivingId) return;
+          reportLaunch("crashed", revertedFromId);
+          try {
+            if (typeof native.clearRevertedFrom === "function") {
+              native.clearRevertedFrom().catch(() => {});
+            }
+          } catch {}
+        } catch {}
+      })
+      .catch(() => {});
+  } catch {}
+}
+
 export function configure(next: UbriotUpdatesConfig): void {
   config = {
     apiBase: normalizeBase(next.apiBase),
@@ -88,6 +141,7 @@ export function configure(next: UbriotUpdatesConfig): void {
     channel: next.channel,
     runtimeVersion: next.runtimeVersion,
   };
+  reportRevertIfCrashed();
 }
 
 export async function checkForUpdate(): Promise<UpdateCheckResult> {
@@ -211,6 +265,10 @@ export function markLaunchSuccessful(): void {
     const native = NativeModules.UbriotUpdates as NativeUbriotUpdates | undefined;
     if (native && typeof native.markLaunchSuccessful === "function") {
       native.markLaunchSuccessful().catch(() => {});
+      native
+        .getState()
+        .then((state) => reportLaunch("launched", state?.runningId ?? state?.active?.id ?? null))
+        .catch(() => {});
     }
   } catch {
     // never allow launch bookkeeping to crash the host app