[V8] Set function to global prototype, preserve the context

Author: tonyfreeman

Sources/CV8/c_v8.cpp

@@ -172,27 +172,22 @@ extern "C" {
         swiftCallback(isolate, id, values, args.Length(), &returnValue);
     }
 
-    void createFunction(void* isolatePtr, void* contextPtr, void* templatePtr, const char* namePtr, int32_t id) {
+    void createFunction(void* isolatePtr, void* contextPtr, const char* namePtr, int32_t id) {
         auto isolate = reinterpret_cast<Isolate*>(isolatePtr);
         auto globalContext = reinterpret_cast<Global<Context>*>(contextPtr);
-        auto globalGlobalTemplate = reinterpret_cast<Global<ObjectTemplate>*>(templatePtr);
 
         Locker isolateLocker(isolate);
         Isolate::Scope isolate_scope(isolate);
         HandleScope handle_scope(isolate);
-        
-        auto data = Integer::New(isolate, id);
-        auto globalTemplate = globalGlobalTemplate->Get(isolate);
-        globalTemplate->Set(
-                            String::NewFromUtf8(isolate, namePtr),
-                            FunctionTemplate::New(isolate, callback, data));
 
         auto context = globalContext->Get(isolate);
-        auto globalObject = context->Global();
-        context->DetachGlobal();
+        Context::Scope context_scope(context);
 
-        auto newContext = Context::New(isolate, NULL, globalTemplate, globalObject);
-        globalContext->Reset(isolate, newContext);
+        auto data = Integer::New(isolate, id);
+        auto name = String::NewFromUtf8(isolate, namePtr);
+        auto functionTemplate = FunctionTemplate::New(isolate, callback, data);
+        auto prototype = Local<Object>::Cast(context->Global()->GetPrototype());
+        prototype->Set(name, functionTemplate->GetFunction());
     }
 
     void setReturnValueUndefined(void* isolatePtr, void* returnValuePtr) {

Sources/CV8/include/c_v8.h

@@ -46,7 +46,7 @@ extern "C" {
 
 
     void (* _Nullable swiftCallback)(void * _Nonnull isolate, int32_t id, void * _Nullable * _Nonnull arguments, int32_t count, void * _Nonnull returnValue);
-    void createFunction(void * _Nonnull  isolatePtr, void * _Nonnull contextPtr, void * _Nonnull templatePtr, const char* _Nonnull namePtr, int32_t id);
+    void createFunction(void * _Nonnull  isolatePtr, void * _Nonnull contextPtr, const char* _Nonnull namePtr, int32_t id);
 
     void setReturnValueUndefined(void * _Nonnull isolatePtr, void * _Nonnull returnValuePtr);
     void setReturnValueNull(void * _Nonnull isolatePtr, void * _Nonnull returnValuePtr);

Sources/CV8Platform/c_v8_platrofm.cpp Sources/CV8Platform/c_v8_platform.cppSources/CV8Platform/c_v8_platrofm.cpp renamed to Sources/CV8Platform/c_v8_platform.cpp

@@ -12,7 +12,7 @@
 #include <string.h> // memset, memcpy
 #include <libplatform/libplatform.h>
 #include <v8.h>
-#include "c_v8_platrofm.h"
+#include "c_v8_platform.h"
 
 using namespace v8;
 

…rces/CV8Platform/include/c_v8_platrofm.h …rces/CV8Platform/include/c_v8_platform.hSources/CV8Platform/include/c_v8_platrofm.h renamed to Sources/CV8Platform/include/c_v8_platform.h Sources/CV8Platform/include/c_v8_platrofm.h renamed to Sources/CV8Platform/include/c_v8_platform.h

@@ -8,8 +8,8 @@
  * See CONTRIBUTORS.txt for the list of the project authors
  */
 
-#ifndef c_v8_platrofm_h
-#define c_v8_platrofm_h
+#ifndef c_v8_platform_h
+#define c_v8_platform_h
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -29,4 +29,4 @@ extern "C" {
 }
 #endif
 
-#endif /* c_v8_platrofm_h */
+#endif /* c_v8_platform_h */

Sources/CV8Platform/include/module.modulemap

@@ -9,7 +9,7 @@
  */
 
 module CV8Platform [system] {
-    header "c_v8_platrofm.h"
+    header "c_v8_platform.h"
     link "v8"
     export *
 }

Sources/V8API/JSContext.swift

@@ -18,9 +18,8 @@ public class JSContext {
 
     public init(isolate: UnsafeMutableRawPointer) {
         self.isolate = isolate
-        let template = CV8.createTemplate(isolate)
+        self.template = CV8.createTemplate(isolate)
         self.context = CV8.createContext(isolate, template)
-        self.template = template
     }
 
     deinit {

Tests/V8Tests/V8Tests.swift

@@ -105,4 +105,35 @@ final class V8Tests: TestCase {
             fail(String(describing: error))
         }
     }
+
+    func testPersistentContext() {
+        do {
+            let context = JSContext()
+            try context.evaluate("result = 'success'")
+            assertEqual(try context.evaluate("result").toString(), "success")
+
+            try context.createFunction(name: "test") { (arguments) -> Value in
+                return .string("test ok")
+            }
+
+            assertEqual(try context.evaluate("result").toString(), "success")
+        } catch {
+            fail(String(describing: error))
+        }
+    }
+
+    func testSandbox() {
+        do {
+            let context = JSContext()
+            try context.evaluate("test = 'hello'")
+            let result = try context.evaluate("test")
+            assertEqual(try result.toString(), "hello")
+        } catch {
+            fail(String(describing: error))
+            return
+        }
+
+        let context = JSContext()
+        assertThrowsError(try context.evaluate("test"))
+    }
 }