Merge pull request #9131 from sgtcoolguy/TIMOB-24796

[TIMOB-24796] iOS: Hybrid CommonJS and Native modules don't handle multiple js files
tidev · Jun 15, 2017 · 1bccffb · 1bccffb
2 parents 3c38df4 + fedaeaf
commit 1bccffb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/iphone/Classes/KrollBridge.m b/iphone/Classes/KrollBridge.m
@@ -913,7 +913,7 @@ - (TiModule *)loadCoreModule:(NSString *)path withContext:(KrollContext *)kroll
 - (NSString *)loadFile:(NSString *)path
 {
 	NSURL *url_ = [NSURL URLWithString:path relativeToURL:[[self host] baseURL]];
-	NSData *data = [TiUtils loadAppResource:url_];
+	NSData *data = [TiUtils loadAppResource:url_]; // try to load encrypted file
 
 	if (data == nil) {
 		data = [NSData dataWithContentsOfURL:url_];

diff --git a/iphone/Classes/TiModule.m b/iphone/Classes/TiModule.m
@@ -20,15 +20,15 @@ -(void)unregisterForNotifications
 }
 
 -(void)dealloc
-{	
+{
     // Have to jump through a hoop here to keep the dealloc block from
     // retaining 'self' by creating a __block access ref. Note that
     // this is only safe as long as the block until completion is YES.
     __block id bself = self;
 	TiThreadPerformOnMainThread(^{
         [bself unregisterForNotifications];
     }, YES);
-    
+
 	RELEASE_TO_NIL(host);
 	if (classNameLookup != NULL)
 	{
@@ -139,7 +139,7 @@ -(id)createProxy:(NSArray*)args forName:(NSString*)name context:(id<TiEvaluator>
 		{
 			return nil;
 		}
-		
+
 		// this is a magic check to see if we're inside a compiled code or not
 		// and if so, drop the prefix
 		NSString *prefix = @"Ti";
@@ -148,23 +148,23 @@ -(id)createProxy:(NSArray*)args forName:(NSString*)name context:(id<TiEvaluator>
 		{
 			moduleName_ = [NSString stringWithCString:class_getName([self class]) encoding:NSUTF8StringEncoding];
 		}
-		else 
+		else
 		{
 			// this is only set in the case of a Plus Module
 			moduleName_ = moduleName;
 			prefix = @"";
 		}
 		moduleName_ = [moduleName_ stringByReplacingOccurrencesOfString:@"Module" withString:@""];
-		NSString *className = [NSString stringWithFormat:@"%@%@%@Proxy",prefix,moduleName_,[name substringFromIndex:range.location+6]];	
+		NSString *className = [NSString stringWithFormat:@"%@%@%@Proxy",prefix,moduleName_,[name substringFromIndex:range.location+6]];
 		resultClass = NSClassFromString(className);
 		if (resultClass==nil)
 		{
 			DebugLog(@"[WARN] Attempted to load %@: Could not find class definition.",className);
-			@throw [NSException exceptionWithName:@"org.appcelerator.module" 
-										   reason:[NSString stringWithFormat:@"invalid method (%@) passed to %@",name,[self class]] 
+			@throw [NSException exceptionWithName:@"org.appcelerator.module"
+										   reason:[NSString stringWithFormat:@"invalid method (%@) passed to %@",name,[self class]]
 										 userInfo:nil];
 		}
-		CFDictionarySetValue(classNameLookup, name, resultClass);		
+		CFDictionarySetValue(classNameLookup, name, resultClass);
 	}
 
 	return [[[resultClass alloc] _initWithPageContext:context args:args] autorelease];
@@ -187,13 +187,13 @@ -(void)loadAssets
         {
             moduleAssets = [[cls alloc] init];
         }
-    }    
+    }
 }
 
 -(NSData*)moduleJS
 {
     [self loadAssets];
-    
+
     if (moduleAssets!=nil)
     {
         return [moduleAssets performSelector:@selector(moduleAsset)];
@@ -205,6 +205,13 @@ -(NSData*)loadModuleAsset:(NSString*)fromPath
 {
     [self loadAssets];
     if ([moduleAssets respondsToSelector:@selector(resolveModuleAsset:)]) {
+       // Look up the file by it's original name. We preserve the filename in our Node-js based module build
+        NSData* data = [moduleAssets performSelector:@selector(resolveModuleAsset:) withObject:fromPath];
+        if (data != nil) {
+          return data;
+        }
+        // FIXME Remove once we no longer support modules built by the old python code!
+        // This tries to load the "mangled" filename generated by our old module build encryption and minification process!
         NSString* assetID = [fromPath stringByReplacingOccurrencesOfString:@"." withString:@"_"];
         return [moduleAssets performSelector:@selector(resolveModuleAsset:) withObject:assetID];
     }
@@ -217,7 +224,7 @@ -(BOOL)isJSModule
 	if (moduleId!=nil)
 	{
 		// if we have module js than we're a JS native module
-		return [self moduleJS]!=nil;	
+		return [self moduleJS]!=nil;
 	}
 	return NO;
 }
@@ -232,7 +239,7 @@ -(NSURL*)moduleResourceURL:(NSString*)name
 -(id)bindCommonJSModule:(NSString*)code
 {
 	NSString *js = [[NSString alloc] initWithFormat:TitaniumModuleRequireFormat,code];
-	
+
 	id result = [[self pageContext] evalJSAndWait:js];
 	[js release];
 	if ([result isKindOfClass:[NSDictionary class]])