fix(ios): hyperloop defineClass() crash

Fixes TIMOB-28458
tidev · Jun 17, 2021 · 90aec65 · 90aec65
1 parent a07c56c
commit 90aec65
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/common/Resources/ti.internal/extensions/binding.js b/common/Resources/ti.internal/extensions/binding.js
@@ -32,8 +32,8 @@ function isHijackableModuleId(path) {
 	return firstChar !== '.' && firstChar !== '/';
 }
 
-// Hack require to point to this as a core module "binding"
-const originalRequire = global.require;
+// Hack require to point to this as core module "binding". (Note that iOS does not have a global require.)
+const originalRequire = global.require ? global.require : require;
 // This works for Windows as-is, and also intercepts the call on Android/iOS for ti.main.js (the first file executed)
 global.require = function (moduleId) {
 

diff --git a/iphone/TitaniumKit/TitaniumKit/Sources/API/KrollBridge.m b/iphone/TitaniumKit/TitaniumKit/Sources/API/KrollBridge.m
@@ -563,6 +563,25 @@ - (id)krollObjectForProxy:(id)proxy
   return result;
 }
 
+- (id)require:(KrollContext *)kroll path:(NSString *)path
+{
+  if (!kroll || !path) {
+    return nil;
+  }
+
+  JSContext *jsContext = [JSContext contextWithJSGlobalContextRef:kroll.context];
+  JSValue *jsResult = [jsContext.globalObject invokeMethod:@"require" withArguments:@[ path ]];
+  if (![jsResult isObject]) {
+    return nil;
+  }
+
+  KrollWrapper *krollResult = [[KrollWrapper alloc] init];
+  [krollResult setBridge:self];
+  [krollResult setJsobject:(JSObjectRef)[jsResult JSValueRef]];
+  [krollResult protectJsobject];
+  return [krollResult autorelease];
+}
+
 + (NSArray *)krollBridgesUsingProxy:(id)proxy
 {
   NSMutableArray *results = nil;