kylefang/react-native-code-push
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native-code-push.git synced 2026-05-20 23:11:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'query-update-with-current-package' of github.com:Microsoft/react-native-code-push

Browse Source
This commit is contained in:
kg422
2015-08-21 17:00:41 -07:00
parent 073cf5bf6b 15c9d93374
commit c3ccd27b4c
6 changed files with 95 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Examples/HybridMobileDeployCompanion/iOS/Info.plist
View File

@@ -40,5 +40,7 @@
<string></string>
<key>CodePushDeploymentKey</key>
<string>deployment-key-here</string>
<key>CodePushServerUrl</key>
<string>server-url-here</string>
</dict>
</plist>

6
Examples/HybridMobileDeployCompanion/index.ios.js
View File

@@ -22,9 +22,9 @@ var HybridMobileDeployCompanion = React.createClass({
this.fetchData();
},
fetchData: function() {
HybridMobileDeploy.queryUpdate((err, update) => {
this.setState({ update: update, updateString: JSON.stringify(update) });
});
HybridMobileDeploy.queryUpdate((err, update) => {
this.setState({ update: update, updateString: JSON.stringify(update) });
});
},
getInitialState: function() {
return { update: false, updateString: "" };

1
Examples/HybridMobileDeployCompanion/react-packager-cache-5737493143262339187995942fd693ba Normal file
View File

File diff suppressed because one or more lines are too long

20
HybridMobileDeploy.ios.js
View File

@@ -8,7 +8,7 @@
var NativeHybridMobileDeploy = require('react-native').NativeModules.HybridMobileDeploy;
var requestFetchAdapter = require("./request-fetch-adapter.js");
var semver = require('semver');
var Sdk = require("hybrid-mobile-deploy-sdk/script/acquisition-sdk").AcquisitionManager;
var Sdk = require("code-push/script/acquisition-sdk").AcquisitionManager;
var sdk;
var config;
@@ -44,16 +44,24 @@ function queryUpdate(callback) {
if (err) callback(err);
getSdk(function(err, sdk) {
if (err) callback(err);
var pkg = {appVersion: configuration.appVersion};
sdk.queryUpdateWithCurrentPackage(pkg, callback);
NativeHybridMobileDeploy.getLocalPackage(function(err, localPackage) {
var queryPackage = {appVersion: configuration.appVersion};
if (!err && localPackage && localPackage.appVersion === configuration.appVersion) {
queryPackage = localPackage;
} else if (err) {
console.log(err);
}
sdk.queryUpdateWithCurrentPackage(queryPackage, callback);
});
});
});
}
function installUpdate(update) {
getConfiguration(function(err, config) {
NativeHybridMobileDeploy.installUpdateFromUrl(config.serverUrl + "acquire/" + config.deploymentKey, (err) => console.log(err));
});
// Use the downloaded package info. Native code will save the package info
// so that the client knows what the current package version is.
NativeHybridMobileDeploy.installUpdate(update, JSON.stringify(update), (err) => console.log(err));
}
var HybridMobileDeploy = {

84
HybridMobileDeploy.m
View File

@@ -15,7 +15,7 @@ RCTBridge * _bridge;
+ (NSString *) getBundleFolderPath
{
NSString* home = NSHomeDirectory();
NSString* bundleFolder = [home stringByAppendingPathComponent:@"HybridMobileDeploy"];
NSString* bundleFolder = [home stringByAppendingPathComponent:@"HybridMobileDeploy/bundle"];
return bundleFolder;
}
@@ -26,6 +26,21 @@ RCTBridge * _bridge;
return [bundleFolderPath stringByAppendingPathComponent:appBundleName];
}
+ (NSString *) getPackageFolderPath
{
NSString* home = NSHomeDirectory();
NSString* packageFolder = [home stringByAppendingPathComponent:@"HybridMobileDeploy/package"];
return packageFolder;
}
+ (NSString *) getPackagePath
{
NSString * packageFolderPath = [self getPackageFolderPath];
NSString* appPackageName = @"localpackage.json";
return [packageFolderPath stringByAppendingPathComponent:appPackageName];
}
+ (NSURL *) getNativeBundleURL
{
return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
@@ -43,11 +58,16 @@ RCTBridge * _bridge;
}
}
- (void) reloadBundle
+ (void) loadBundle:(NSString*)rootComponent
{
dispatch_async(dispatch_get_main_queue(), ^{
self.bridge.bundleURL = [HybridMobileDeploy getBundleUrl];
[self.bridge reload];
RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:[self getBundleUrl]
moduleName:rootComponent
launchOptions:nil];
UIViewController *rootViewController = [[UIViewController alloc] init];
rootViewController.view = rootView;
[UIApplication sharedApplication].delegate.window.rootViewController = rootViewController;
});
}
@@ -56,20 +76,20 @@ RCT_EXPORT_METHOD(getConfiguration:(RCTResponseSenderBlock)callback)
callback(@[[NSNull null], [HybridMobileDeployConfig getConfiguration]]);
}
RCT_EXPORT_METHOD(installUpdateFromUrl:(NSString*)updateUrl
RCT_EXPORT_METHOD(installUpdate:(NSDictionary*)updatePackage
packageJsonString:(NSString*) packageJsonString
callback:(RCTResponseSenderBlock)callback)
{
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
NSURL* url = [NSURL URLWithString:updateUrl];
NSURL* url = [NSURL URLWithString:updatePackage[@"downloadUrl"]];
NSError *err;
NSString *updateContents = [[NSString alloc] initWithContentsOfURL:url
encoding:NSUTF8StringEncoding
error:&err];
if (err) {
// TODO send download url
callback(@[RCTMakeError(@"Error downloading url", err, [[NSDictionary alloc] initWithObjectsAndKeys:updateUrl,@"updateUrl", nil])]);
callback(@[RCTMakeError(@"Error downloading url", err, [[NSDictionary alloc] initWithObjectsAndKeys:[url absoluteString],@"updateUrl", nil])]);
} else {
dispatch_async(dispatch_get_main_queue(), ^{
NSError *saveError;
@@ -77,6 +97,7 @@ RCT_EXPORT_METHOD(installUpdateFromUrl:(NSString*)updateUrl
if (![[NSFileManager defaultManager] fileExistsAtPath:bundleFolderPath]) {
[[NSFileManager defaultManager] createDirectoryAtPath:bundleFolderPath withIntermediateDirectories:YES attributes:nil error:&saveError];
}
[updateContents writeToFile:[HybridMobileDeploy getBundlePath]
atomically:YES
encoding:NSUTF8StringEncoding
@@ -85,12 +106,55 @@ RCT_EXPORT_METHOD(installUpdateFromUrl:(NSString*)updateUrl
// TODO send file path
callback(@[RCTMakeError(@"Error saving file", err, [[NSDictionary alloc] initWithObjectsAndKeys:[HybridMobileDeploy getBundlePath],@"bundlePath", nil])]);
} else {
[self reloadBundle];
callback(@[[NSNull null]]);
// Save the package info too.
NSString *packageFolderPath = [HybridMobileDeploy getPackageFolderPath];
if (![[NSFileManager defaultManager] fileExistsAtPath:packageFolderPath]) {
[[NSFileManager defaultManager] createDirectoryAtPath:packageFolderPath withIntermediateDirectories:YES attributes:nil error:&saveError];
}
[packageJsonString writeToFile:[HybridMobileDeploy getPackagePath]
atomically:YES
encoding:NSUTF8StringEncoding
error:&saveError];
if (saveError) {
callback(@[RCTMakeError(@"Error saving file", err, [[NSDictionary alloc] initWithObjectsAndKeys:[HybridMobileDeploy getPackagePath],@"packagePath", nil])]);
} else {
[HybridMobileDeploy loadBundle:[HybridMobileDeployConfig getRootComponent]];
callback(@[[NSNull null]]);
}
}
});
}
});
}
RCT_EXPORT_METHOD(getLocalPackage: (RCTResponseSenderBlock)callback)
{
NSString *path = [HybridMobileDeploy getPackagePath];
dispatch_async(dispatch_get_main_queue(), ^{
NSError* readError;
NSString *content = [NSString stringWithContentsOfFile:path encoding:NSUTF8StringEncoding error:&readError];
if (readError) {
callback(@[RCTMakeError(@"Error finding local package ", readError, [[NSDictionary alloc] initWithObjectsAndKeys:path,@"packagePath", nil]), [NSNull null]]);
} else {
NSError * parseError;
NSData *data = [content dataUsingEncoding:NSUTF8StringEncoding];
NSDictionary* json = [NSJSONSerialization JSONObjectWithData:data
options:kNilOptions
error:&parseError];
if (parseError) {
callback(@[RCTMakeError(@"Error parsing contents of local package ", parseError, [[NSDictionary alloc] initWithObjectsAndKeys:path,@"packagePath", nil]), [NSNull null]]);
} else {
callback(@[[NSNull null], json]);
}
}
});
}
@end

2
package.json
View File

@@ -4,7 +4,7 @@
"main": "HybridMobileDeploy.ios.js",
"keywords": "react-native",
"dependencies": {
"hybrid-mobile-deploy-sdk": "file:../website/sdk/bin",
"code-push": "file:../website/sdk/bin",
"semver": "^4.3.6"
},
"devDependencies": {