[V8] Split to V8 and V8API to reuse in Node.js

Author: tonyfreeman

Package.swift

@@ -16,6 +16,7 @@ let package = Package(
     products: [
         .library(name: "JavaScript", targets: ["JavaScript"]),
         .library(name: "V8", targets: ["V8"]),
+        .library(name: "V8API", targets: ["V8API"]),
         .library(name: "JavaScriptCoreSwift", targets: ["JavaScriptCoreSwift"])
     ],
     dependencies: [
@@ -33,12 +34,18 @@ let package = Package(
         .target(
             name: "CV8",
             dependencies: []),
+        .target(
+            name: "CV8Platform",
+            dependencies: []),
         .target(
             name: "JavaScriptCoreSwift",
             dependencies: ["CJavaScriptCore", "JavaScript"]),
         .target(
-            name: "V8",
+            name: "V8API",
             dependencies: ["CV8", "Platform", "JavaScript"]),
+        .target(
+            name: "V8",
+            dependencies: ["CV8Platform", "V8API", "Platform", "JavaScript"]),
         .target(
             name: "JavaScript",
             dependencies: []),

Sources/CV8/wrappers.cpp Sources/CV8/c_v8.cppSources/CV8/wrappers.cpp renamed to Sources/CV8/c_v8.cpp

@@ -10,22 +10,11 @@
 
 #include <stdlib.h> // malloc, free
 #include <string.h> // memset, memcpy
-#include <libplatform/libplatform.h>
 #include <v8.h>
-#include "wrappers.h"
+#include "c_v8.h"
 
 using namespace v8;
 
-class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
-public:
-    virtual void *Allocate(size_t length){
-        void *data = AllocateUninitialized(length);
-        return data == NULL ? data : memset(data, 0, length);
-    }
-    virtual void *AllocateUninitialized(size_t length) { return malloc(length); }
-    virtual void Free(void *data, size_t) { free(data); }
-};
-
 class GlobalValue {
 public:
     explicit GlobalValue(Isolate* isolate, Global<Value>* value):
@@ -61,32 +50,6 @@ class GlobalValue {
 };
 
 extern "C" {
-    ArrayBufferAllocator bufferAllocator;
-
-    void* initialize() {
-        V8::InitializeICU();
-        auto platform = platform::CreateDefaultPlatform();
-        V8::InitializePlatform(platform);
-        V8::Initialize();
-        return platform;
-    }
-
-    void dispose(void* platform) {
-        V8::Dispose();
-        V8::ShutdownPlatform();
-        delete reinterpret_cast<Platform*>(platform);;
-    }
-
-    void* createIsolate() {
-        Isolate::CreateParams create_params;
-        create_params.array_buffer_allocator = &bufferAllocator;
-        return Isolate::New(create_params);
-    }
-
-    void disposeIsolate(void* isolate) {
-        reinterpret_cast<Isolate*>(isolate)->Dispose();
-    }
-
     void* createTemplate(void* isolatePtr) {
         auto isolate = reinterpret_cast<Isolate*>(isolatePtr);
         Locker isolateLocker(isolate);
@@ -229,7 +192,6 @@ extern "C" {
         context->DetachGlobal();
 
         auto newContext = Context::New(isolate, NULL, globalTemplate, globalObject);
-
         globalContext->Reset(isolate, newContext);
     }
 

Sources/CV8/include/wrappers.h Sources/CV8/include/c_v8.hSources/CV8/include/wrappers.h renamed to Sources/CV8/include/c_v8.h

@@ -8,8 +8,8 @@
  * See CONTRIBUTORS.txt for the list of the project authors
  */
 
-#ifndef wrappers_h
-#define wrappers_h
+#ifndef c_v8_h
+#define c_v8_h
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -18,12 +18,6 @@
 extern "C" {
 #endif
 
-    // global
-    void * _Nonnull initialize();
-    void dispose(void * _Nonnull platform);
-    // isolate
-    void * _Nonnull createIsolate();
-    void disposeIsolate(void * _Nonnull isolate);
     // global template
     void * _Nonnull createTemplate(void * _Nonnull isolate);
     void disposeTemplate(void * _Nonnull context);
@@ -68,4 +62,4 @@ extern "C" {
 }
 #endif
 
-#endif /* wrappers_h */
+#endif /* c_v8_h */

Sources/CV8/include/module.modulemap

@@ -9,7 +9,7 @@
  */
 
 module CV8 [system] {
-    header "wrappers.h"
+    header "c_v8.h"
     link "v8"
     export *
 }

Sources/CV8Platform/c_v8_platrofm.cpp

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2017 Tris Foundation and the project authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License
+ *
+ * See LICENSE.txt in the project root for license information
+ * See CONTRIBUTORS.txt for the list of the project authors
+ */
+
+#include <stdlib.h> // malloc, free
+#include <string.h> // memset, memcpy
+#include <libplatform/libplatform.h>
+#include <v8.h>
+#include "c_v8_platrofm.h"
+
+using namespace v8;
+
+class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
+public:
+    virtual void *Allocate(size_t length){
+        void *data = AllocateUninitialized(length);
+        return data == NULL ? data : memset(data, 0, length);
+    }
+    virtual void *AllocateUninitialized(size_t length) { return malloc(length); }
+    virtual void Free(void *data, size_t) { free(data); }
+};
+
+extern "C" {
+    ArrayBufferAllocator bufferAllocator;
+
+    void* initialize() {
+        V8::InitializeICU();
+        auto platform = platform::CreateDefaultPlatform();
+        V8::InitializePlatform(platform);
+        V8::Initialize();
+        return platform;
+    }
+
+    void dispose(void* platform) {
+        V8::Dispose();
+        V8::ShutdownPlatform();
+        delete reinterpret_cast<Platform*>(platform);;
+    }
+
+    void* createIsolate() {
+        Isolate::CreateParams create_params;
+        create_params.array_buffer_allocator = &bufferAllocator;
+        return Isolate::New(create_params);
+    }
+
+    void disposeIsolate(void* isolate) {
+        reinterpret_cast<Isolate*>(isolate)->Dispose();
+    }
+}

Sources/CV8Platform/include/c_v8_platrofm.h

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2017 Tris Foundation and the project authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License
+ *
+ * See LICENSE.txt in the project root for license information
+ * See CONTRIBUTORS.txt for the list of the project authors
+ */
+
+#ifndef c_v8_platrofm_h
+#define c_v8_platrofm_h
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    // global
+    void * _Nonnull initialize();
+    void dispose(void * _Nonnull platform);
+    // isolater
+    void * _Nonnull createIsolate();
+    void disposeIsolate(void * _Nonnull isolate);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* c_v8_platrofm_h */

Sources/CV8Platform/include/module.modulemap

@@ -0,0 +1,15 @@
+/*
+ * Copyright 2017 Tris Foundation and the project authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License
+ *
+ * See LICENSE.txt in the project root for license information
+ * See CONTRIBUTORS.txt for the list of the project authors
+ */
+
+module CV8Platform [system] {
+    header "c_v8_platrofm.h"
+    link "v8"
+    export *
+}

Sources/V8/JSEngine.swift

@@ -8,7 +8,6 @@
  * See CONTRIBUTORS.txt for the list of the project authors
  */
 
-import CV8
 import JavaScript
 
 public class JSEngine: JavaScript.JSEngine {

Sources/V8/JSRuntime.swift

@@ -8,9 +8,11 @@
  * See CONTRIBUTORS.txt for the list of the project authors
  */
 
-import CV8
+import CV8Platform
 import JavaScript
 
+@_exported import V8API
+
 public class JSRuntime {
     let platform: UnsafeMutableRawPointer
     let isolate: UnsafeMutableRawPointer
@@ -20,9 +22,11 @@ public class JSRuntime {
     }()
 
     public required init() {
+        // The whole V8API & V8 split is caused
+        // by difference in this initialization
+        // between standalone v8 and node.js
         self.platform = initialize()
         self.isolate = createIsolate()
-        CV8.swiftCallback = functionWrapper
     }
 
     deinit {
@@ -31,8 +35,14 @@ public class JSRuntime {
     }
 }
 
+extension V8API.JSContext {
+    public convenience init(_ runtime: JSRuntime = JSRuntime.global) {
+        self.init(isolate: runtime.isolate)
+    }
+}
+
 extension JSRuntime: JavaScript.JSRuntime {
-    public func createContext() -> JSContext {
-        return JSContext(self)
+    public func createContext() -> V8API.JSContext {
+        return JSContext()
     }
 }