react-native-update 8.1.0 → 9.0.0-beta.1

package/e2e/starter.test.js

@@ -0,0 +1,23 @@
+describe('Example', () => {
+  beforeAll(async () => {
+    await device.launchApp();
+  });
+
+  beforeEach(async () => {
+    await device.reloadReactNative();
+  });
+
+  it('should have welcome screen', async () => {
+    await expect(element(by.id('welcome'))).toBeVisible();
+  });
+
+  it('should show hello screen after tap', async () => {
+    await element(by.id('hello_button')).tap();
+    await expect(element(by.text('Hello!!!'))).toBeVisible();
+  });
+
+  it('should show world screen after tap', async () => {
+    await element(by.id('world_button')).tap();
+    await expect(element(by.text('World!!!'))).toBeVisible();
+  });
+});

package/ios/RCTPushy/{RCTPushy.m → RCTPushy.mm}

@@ -1,7 +1,10 @@
 #import "RCTPushy.h"
 #import "RCTPushyDownloader.h"
 #import "RCTPushyManager.h"
-
+// Thanks to this guard, we won't import this header when we build for the old architecture.
+#ifdef RCT_NEW_ARCH_ENABLED
+#import "RCTPushySpec.h"
+#endif
 
 #import <React/RCTConvert.h>
 #import <React/RCTLog.h>
@@ -189,29 +192,53 @@ RCT_EXPORT_MODULE(RCTPushy);
     return self;
 }
 
-RCT_EXPORT_METHOD(setBlockUpdate:(NSDictionary *)options)
+RCT_EXPORT_METHOD(setBlockUpdate:(NSDictionary *)options
+                  resolver:(RCTPromiseResolveBlock)resolve
+                                    rejecter:(RCTPromiseRejectBlock)reject)
 {
     // NSMutableDictionary *blockUpdateInfo = [NSMutableDictionary new];
     // blockUpdateInfo[@"reason"] = options[@"reason"];
     // blockUpdateInfo[@"until"] = options[@"until"];
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    [defaults setObject:options forKey:keyBlockUpdate];
-    [defaults synchronize];
+    @try {
+        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+        [defaults setObject:options forKey:keyBlockUpdate];
+        [defaults synchronize];
+        resolve(@true);
+    }
+    @catch (NSException *exception) {
+        reject(@"执行报错", nil, nil);
+    }
 }
 
-RCT_EXPORT_METHOD(setUuid:(NSString *)uuid)
+RCT_EXPORT_METHOD(setUuid:(NSString *)uuid  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    [defaults setObject:uuid forKey:keyUuid];
-    [defaults synchronize];
+    @try {
+        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+        [defaults setObject:uuid forKey:keyUuid];
+        [defaults synchronize];
+        resolve(@true);
+    }
+    @catch (NSException *exception) {
+        reject(@"json格式校验报错", nil, nil);
+    }
 }
 
 RCT_EXPORT_METHOD(setLocalHashInfo:(NSString *)hash
-                  value:(NSString *)value)
+                  value:(NSString *)value resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    [defaults setObject:value forKey:[keyHashInfo stringByAppendingString:hash]];
-    [defaults synchronize];
+    NSData *data = [value dataUsingEncoding:NSUTF8StringEncoding];
+    NSError *error = nil;
+    id object = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
+    if (object && [object isKindOfClass:[NSDictionary class]]) {
+        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+        [defaults setObject:value forKey:[keyHashInfo stringByAppendingString:hash]];
+        [defaults synchronize];
+        resolve(@true);
+    } else {
+        reject(@"json格式校验报错", nil, nil);
+    }
 }
 
 
@@ -266,7 +293,9 @@ RCT_EXPORT_METHOD(downloadPatchFromPpk:(NSDictionary *)options
     }];
 }
 
-RCT_EXPORT_METHOD(setNeedUpdate:(NSDictionary *)options)
+RCT_EXPORT_METHOD(setNeedUpdate:(NSDictionary *)options
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
     NSString *hash = options[@"hash"];
     
@@ -287,45 +316,66 @@ RCT_EXPORT_METHOD(setNeedUpdate:(NSDictionary *)options)
         [defaults setObject:newInfo forKey:keyPushyInfo];
         
         [defaults synchronize];
+        resolve(@true);
+    }else{
+        reject(@"执行报错", nil, nil);
     }
 }
 
-RCT_EXPORT_METHOD(reloadUpdate:(NSDictionary *)options)
+RCT_EXPORT_METHOD(reloadUpdate:(NSDictionary *)options
+                  resolver:(RCTPromiseResolveBlock)resolve
+                                    rejecter:(RCTPromiseRejectBlock)reject)
 {
-    NSString *hash = options[@"hash"];
-
-    if (hash.length) {
-        [self setNeedUpdate:options];
-        
-        // reload 0.62+
-        // RCTReloadCommandSetBundleURL([[self class] bundleURL]);
-        // RCTTriggerReloadCommandListeners(@"pushy reload");
-        
-       dispatch_async(dispatch_get_main_queue(), ^{
-           [self.bridge setValue:[[self class] bundleURL] forKey:@"bundleURL"];
-           [self.bridge reload];
-       });
+    @try {
+        NSString *hash = options[@"hash"];
+        if (hash.length) {
+            [self setNeedUpdate:options resolver:resolve rejecter:reject];
+            
+            // reload 0.62+
+            // RCTReloadCommandSetBundleURL([[self class] bundleURL]);
+            // RCTTriggerReloadCommandListeners(@"pushy reload");
+            
+           dispatch_async(dispatch_get_main_queue(), ^{
+               [self.bridge setValue:[[self class] bundleURL] forKey:@"bundleURL"];
+               [self.bridge reload];
+           });
+            resolve(@true);
+        }else{
+            reject(@"执行报错", nil, nil);
+        }
+    }
+    @catch (NSException *exception) {
+        reject(@"执行报错", nil, nil);
     }
 }
 
-RCT_EXPORT_METHOD(markSuccess)
+RCT_EXPORT_METHOD(markSuccess:
+                  resolver:(RCTPromiseResolveBlock)resolve
+                                    rejecter:(RCTPromiseRejectBlock)reject)
 {
-    // up package info
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSMutableDictionary *pushyInfo = [[NSMutableDictionary alloc] initWithDictionary:[defaults objectForKey:keyPushyInfo]];
-    [pushyInfo setObject:@(NO) forKey:paramIsFirstTime];
-    [pushyInfo setObject:@(YES) forKey:paramIsFirstLoadOk];
     
-    NSString *lastVersion = pushyInfo[paramLastVersion];
-    NSString *curVersion = pushyInfo[paramCurrentVersion];
-    if (lastVersion != nil && ![lastVersion isEqualToString:curVersion]) {
-        [pushyInfo removeObjectForKey:[keyHashInfo stringByAppendingString:lastVersion]];
+    @try {
+        // up package info
+        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+        NSMutableDictionary *pushyInfo = [[NSMutableDictionary alloc] initWithDictionary:[defaults objectForKey:keyPushyInfo]];
+        [pushyInfo setObject:@(NO) forKey:paramIsFirstTime];
+        [pushyInfo setObject:@(YES) forKey:paramIsFirstLoadOk];
+        
+        NSString *lastVersion = pushyInfo[paramLastVersion];
+        NSString *curVersion = pushyInfo[paramCurrentVersion];
+        if (lastVersion != nil && ![lastVersion isEqualToString:curVersion]) {
+            [pushyInfo removeObjectForKey:[keyHashInfo stringByAppendingString:lastVersion]];
+        }
+        [defaults setObject:pushyInfo forKey:keyPushyInfo];
+        [defaults synchronize];
+        
+        // clear other package dir
+        [self clearInvalidFiles];
+        resolve(@true);
+    }
+    @catch (NSException *exception) {
+        reject(@"执行报错", nil, nil);
     }
-    [defaults setObject:pushyInfo forKey:keyPushyInfo];
-    [defaults synchronize];
-    
-    // clear other package dir
-    [self clearInvalidFiles];
 }
 
 
@@ -351,6 +401,19 @@ RCT_EXPORT_METHOD(markSuccess)
     // Remove upstream listeners, stop unnecessary background tasks
 }
 
+- (BOOL) isBlankString:(NSString *)string {
+    if (string == nil || string == NULL) {
+        return YES;
+    }
+    if ([string isKindOfClass:[NSNull class]]) {
+        return YES;
+    }
+    if ([[string stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] length]==0) {
+        return YES;
+    }
+    return NO;
+}
+
 
 - (void)doPushy:(PushyType)type options:(NSDictionary *)options callback:(void (^)(NSError *error))callback
 {
@@ -362,7 +425,7 @@ RCT_EXPORT_METHOD(markSuccess)
         return;
     }
     NSString *originHash = [RCTConvert NSString:options[@"originHash"]];
-    if (type == PushyTypePatchFromPpk && originHash <= 0) {
+    if (type == PushyTypePatchFromPpk && [self isBlankString:originHash]) {
         callback([self errorWithMessage:ERROR_OPTIONS]);
         return;
     }
@@ -562,4 +625,13 @@ RCT_EXPORT_METHOD(markSuccess)
 #endif
 }
 
+// Thanks to this guard, we won't compile this code when we build for the old architecture.
+#ifdef RCT_NEW_ARCH_ENABLED
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+    return std::make_shared<facebook::react::NativeUpdateSpecJSI>(params);
+}
+#endif
+
 @end

package/ios/pushy_build_time.txt

@@ -1 +1 @@
-1654072539
+1680488830

package/lib/NativeUpdate.js

@@ -0,0 +1,51 @@
+/**
+ * @format
+ * @flow strict-local
+ */
+'use strict';
+
+import type { TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';
+import { TurboModuleRegistry } from 'react-native';
+
+export interface Spec extends TurboModule {
+  getConstants: () => {
+    downloadRootDir: string,
+    packageVersion: string,
+    currentVersion: string,
+    isFirstTime: boolean,
+    rolledBackVersion: string,
+    buildTime: string,
+    blockUpdate: Object,
+    uuid: string,
+    isUsingBundleUrl: boolean,
+  };
+  setLocalHashInfo(hash: string, info: string): Promise<void>;
+  getLocalHashInfo(hash: string): Promise<string>;
+  setUuid(uuid: string): Promise<void>;
+  setBlockUpdate(options: { reason: string, until: number }): Promise<void>;
+  reloadUpdate(options: { hash: string }): Promise<void>;
+  setNeedUpdate(options: { hash: string }): Promise<void>;
+  markSuccess(): Promise<void>;
+  downloadPatchFromPpk(options: {
+    updateUrl: string,
+    hash: string,
+    originHash: string,
+  }): Promise<void>;
+  downloadPatchFromPackage(options: {
+    updateUrl: string,
+    hash: string,
+  }): Promise<void>;
+  downloadFullUpdate(options: {
+    updateUrl: string,
+    hash: string,
+  }): Promise<void>;
+  downloadAndInstallApk(options: {
+    url: string,
+    target: string,
+    hash: string,
+  }): Promise<void>;
+  addListener(eventName: string): void;
+  removeListeners(count: number): void;
+}
+
+export default (TurboModuleRegistry.get<Spec>('Pushy'): ?Spec);

package/lib/{endpoint.js → endpoint.ts}

@@ -1,6 +1,6 @@
 let currentEndpoint = 'https://update.react-native.cn/api';
 
-function ping(url, rejectImmediate) {
+function ping(url: string, rejectImmediate?: boolean) {
   return new Promise((resolve, reject) => {
     const xhr = new XMLHttpRequest();
     xhr.onreadystatechange = (e) => {
@@ -20,12 +20,12 @@ function ping(url, rejectImmediate) {
   });
 }
 
-function logger(...args) {
-  // console.warn('pushy', ...args);
+function logger(...args: any[]) {
+  console.log('Pushy: ', ...args);
 }
 
-let backupEndpoints = [];
-let backupEndpointsQueryUrl =
+let backupEndpoints: string[] = [];
+let backupEndpointsQueryUrl: string | null =
   'https://cdn.jsdelivr.net/gh/reactnativecn/react-native-pushy@master/endpoints.json';
 
 export async function tryBackupEndpoints() {
@@ -34,10 +34,10 @@ export async function tryBackupEndpoints() {
   }
   try {
     await ping(getStatusUrl(), true);
-    logger('current endpoint ok');
+    logger('current endpoint ok', currentEndpoint);
     return;
   } catch (e) {
-    logger('current endpoint failed');
+    logger('current endpoint failed', currentEndpoint);
   }
   if (!backupEndpoints.length && backupEndpointsQueryUrl) {
     try {
@@ -76,11 +76,21 @@ export function getCheckUrl(APPKEY, endpoint = currentEndpoint) {
   return `${endpoint}/checkUpdate/${APPKEY}`;
 }
 
-export function getReportUrl(endpoint = currentEndpoint) {
-  return `${endpoint}/report`;
-}
-
-export function setCustomEndpoints({ main, backups, backupQueryUrl }) {
+/**
+ * @param {string} main - The main api endpoint
+ * @param {string[]} [backups] - The back up endpoints.
+ * @param {string} [backupQueryUrl] - An url that return a json file containing an array of endpoint.
+ *                                    like: ["https://backup.api/1", "https://backup.api/2"]
+ */
+export function setCustomEndpoints({
+  main,
+  backups,
+  backupQueryUrl,
+}: {
+  main: string;
+  backups?: string[];
+  backupQueryUrl?: string;
+}) {
   currentEndpoint = main;
   backupEndpointsQueryUrl = null;
   if (Array.isArray(backups) && backups.length > 0) {

package/lib/index.web.js

@@ -15,3 +15,4 @@ export const downloadAndInstallApk = noop;
 export const setCustomEndpoints = noop;
 export const getCurrentVersionInfo = noop;
 export const simpleUpdate = noop;
+export const onEvents = noop;