@nativescript/canvas 2.0.0-beta.9 → 2.0.0-rc.0

package/platforms/ios/build.xcconfig

@@ -2,4 +2,6 @@ OTHER_LDFLAGS[sdk=*] = $(inherited) -framework Foundation -framework CanvasNativ
 
 HEADER_SEARCH_PATHS = $(inherited) "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/NativeScript.framework/Headers" "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/NativeScript.framework/Headers/include"
 
-CLANG_CXX_LANGUAGE_STANDARD = c++17
+CLANG_CXX_LANGUAGE_STANDARD = c++17
+
+GLES_SILENCE_DEPRECATION = 1

package/platforms/ios/src/NSOperationQueueWrapper.h

@@ -1,7 +1,9 @@
+#pragma once
+
 #include <functional>
 class NSOperationQueueWrapper {
 public:
-    NSOperationQueueWrapper(bool currentQueue);
+    NSOperationQueueWrapper(bool currentQueue, bool serial = false);
     ~NSOperationQueueWrapper();
 
     void addOperation(std::function<void()> task);

package/platforms/ios/src/NSOperationQueueWrapper.mm

@@ -7,12 +7,16 @@
 
 @implementation NSOperationQueueWrapperObjC {
     NSOperationQueue* operationQueue;
+    __CFRunLoop* current;
+    BOOL isSerial;
 }
 
 - (instancetype)init {
     self = [super init];
     if (self) {
-        operationQueue = [[NSOperationQueue alloc] init];
+        isSerial = false;
+        operationQueue = NULL;
+        current = NULL;
     }
     return self;
 }
@@ -20,7 +24,15 @@
 -(instancetype)initWithCurrentQueue {
     self = [super init];
     if (self) {
-        operationQueue = [NSOperationQueue currentQueue];
+        current = CFRunLoopGetCurrent();
+    }
+    return self;
+}
+
+-(instancetype)initWithSerial:(BOOL)serial {
+    self = [super init];
+    if (self) {
+        isSerial = serial;
     }
     return self;
 }
@@ -28,11 +40,32 @@
 - (void)dealloc {}
 
 - (void)addOperation:(void (^)())task {
-    NSBlockOperation* operation = [NSBlockOperation blockOperationWithBlock:^{
-        task();
-    }];
     
-    [operationQueue addOperation:operation];
+    if(current != NULL){
+        if(current == CFRunLoopGetCurrent()){
+            task();
+        }else {
+            CFRunLoopPerformBlock(current, kCFRunLoopDefaultMode, ^{
+                task();
+            });
+            CFRunLoopWakeUp(current);
+        }
+    }else if(operationQueue != NULL){
+        NSBlockOperation* operation = [NSBlockOperation blockOperationWithBlock:^{
+            task();
+        }];
+        
+        [operationQueue addOperation:operation];
+    }else if(isSerial){
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_SERIAL, 0), ^{
+              task();
+          });
+        
+    }else {
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+              task();
+          });
+    }
 }
 
 - (NSOperationQueue*)getOperationQueue {
@@ -42,7 +75,7 @@
 
 @end
 
-NSOperationQueueWrapper::NSOperationQueueWrapper(bool currentQueue) {
+NSOperationQueueWrapper::NSOperationQueueWrapper(bool currentQueue, bool serial) {
     if (currentQueue) {
         NSOperationQueueWrapperObjC* objcWrapper = [[NSOperationQueueWrapperObjC alloc] initWithCurrentQueue];
         
@@ -50,11 +83,10 @@ NSOperationQueueWrapper::NSOperationQueueWrapper(bool currentQueue) {
     
         operationQueue = (void*)ptr;
     }else {
-        NSOperationQueueWrapperObjC* objcWrapper = [[NSOperationQueueWrapperObjC alloc] init];
+        NSOperationQueueWrapperObjC* objcWrapper = [[NSOperationQueueWrapperObjC alloc] initWithSerial: serial];
         CFTypeRef ptr = (__bridge_retained CFTypeRef)objcWrapper;
         operationQueue = (void*)ptr;
     }
-   
 }
 
 NSOperationQueueWrapper::~NSOperationQueueWrapper() {

package/platforms/ios/src/cpp/AsyncCallback.h

@@ -0,0 +1,214 @@
+//
+// Created by Osei Fortune on 05/08/2024.
+//
+
+#pragma once
+
+#include "Common.h"
+
+#ifdef __ANDROID__
+
+#include <android/looper.h>
+#include <cassert>
+
+#endif
+
+#ifdef __APPLE__
+#include "NSOperationQueueWrapper.h"
+#endif
+
+#include <unistd.h>
+#include <fcntl.h>
+#include <thread>
+
+typedef void(*CompleteCallback)(bool success, void *data);
+
+
+#ifdef __APPLE__
+struct AsyncCallback {
+
+    struct Inner {
+        NSOperationQueueWrapper* current_queue = nullptr;
+        v8::Isolate *isolate_;
+        v8::Persistent<v8::Function> callback_;
+        CompleteCallback completeCallback_;
+        CompleteCallback completeCallbackWrapper_;
+        bool isPrepared_ = false;
+        void* data = nullptr;
+
+        Inner(v8::Isolate *isolate, v8::Local<v8::Function> callback,
+              CompleteCallback completeCallback) : isolate_(isolate),
+                                                   callback_(v8::Persistent<v8::Function>(
+                                                           isolate,
+                                                           callback)) {
+            this->completeCallback_ = completeCallback;
+
+            this->completeCallbackWrapper_ = [](bool success, void *data){
+                if(data != nullptr){
+                    auto* callback = static_cast<AsyncCallback*>(data);
+                    if(callback->inner_->current_queue == nullptr){
+                        return;
+                    }
+                    
+                    auto inner = std::shared_ptr<Inner>(callback->inner_);
+                                        
+                    std::thread thread([success, data, callback](std::shared_ptr<Inner> inner){
+                        inner->current_queue = nullptr;
+                        inner->completeCallback_(success, data);
+                    }, std::move(inner));
+                    
+                    thread.detach();
+                    
+//                    callback->inner_->current_queue->addOperation([success, data, callback, inner_ptr](){
+//                        inner_ptr->completeCallback_(success, data);
+//                       // delete callback;
+//                    });
+                }
+            };
+        }
+
+        void prepare(){
+            current_queue = new NSOperationQueueWrapper(true);
+            isPrepared_ = true;
+        }
+
+        void execute(bool complete, AsyncCallback* callback){
+            completeCallbackWrapper_(complete, callback);
+        }
+
+        ~Inner() {
+            callback_.Reset();
+        }
+    };
+
+    std::shared_ptr<Inner> inner_;
+
+
+    void prepare(){
+        auto inner = this->inner_.get();
+        if(inner == nullptr){return;}
+        inner->prepare();
+    }
+
+    void execute(bool complete) {
+        auto inner = this->inner_.get();
+        if (inner == nullptr) { return; }
+        inner->execute(complete, this);
+    }
+
+
+    explicit AsyncCallback(std::shared_ptr<Inner> inner) : inner_(std::move(inner)) {}
+
+
+    AsyncCallback(v8::Isolate *isolate, v8::Local<v8::Function> callback,
+                  CompleteCallback completeCallback) : inner_(
+            std::make_shared<Inner>(isolate, callback, completeCallback)) {
+    }
+
+
+};
+#endif
+
+#ifdef __ANDROID__
+
+struct AsyncCallback {
+
+    struct Inner {
+        int fd_[2];
+        ALooper *looper_;
+        v8::Isolate *isolate_;
+        v8::Persistent<v8::Function> callback_;
+        CompleteCallback completeCallback_;
+        bool isPrepared_ = false;
+        void* data;
+
+        Inner(v8::Isolate *isolate, v8::Local<v8::Function> callback,
+              CompleteCallback completeCallback) : isolate_(isolate),
+                                                   callback_(v8::Persistent<v8::Function>(
+                                                           isolate,
+                                                           callback)) {
+            this->completeCallback_ = completeCallback;
+        }
+
+        void prepare() {
+            // release previous looper
+            if (isPrepared_) {
+                ALooper_removeFd(looper_, fd_[0]);
+                close(fd_[0]);
+                fd_[0] = -1;
+                fd_[1] = -1;
+                ALooper_release(looper_);
+            }
+
+            auto res = pipe(fd_);
+            assert(res != -1);
+            res = fcntl(fd_[1], F_SETFL, O_NONBLOCK);
+            assert(res != -1);
+            looper_ = ALooper_prepare(0);
+            ALooper_acquire(looper_);
+
+            isPrepared_ = true;
+        }
+
+        void execute(bool complete) const {
+            if (!isPrepared_) { return; }
+            write(fd_[1],
+                  &complete,
+                  sizeof(bool));
+        }
+
+        ~Inner() {
+            if(!isPrepared_){
+                return;
+            }
+            ALooper_removeFd(looper_, fd_[0]);
+            close(fd_[0]);
+            ALooper_release(looper_);
+            callback_.Reset();
+        }
+    };
+
+    std::shared_ptr<Inner> inner_;
+
+    void prepare() const {
+        auto inner = this->inner_.get();
+        if (inner == nullptr) { return; }
+        inner->prepare();
+        auto looper = inner->looper_;
+        auto fd = inner->fd_[0];
+
+        auto data = new AsyncCallback(this->inner_);
+        ALooper_addFd(looper,
+                      fd,
+                      0,
+                      ALOOPER_EVENT_INPUT,
+                      [](int fd, int events,
+                         void *data) {
+                          auto cb = static_cast<AsyncCallback *>(data);
+                          bool done = false;
+                          read(fd, &done,
+                               sizeof(bool));
+                          cb->inner_->completeCallback_(done, data);
+                          return 0;
+                      }, (void *) data);
+    }
+
+    void execute(bool complete) const {
+        auto inner = this->inner_.get();
+        if (inner == nullptr) { return; }
+        inner->execute(complete);
+    }
+
+
+    explicit AsyncCallback(std::shared_ptr<Inner> inner) : inner_(std::move(inner)) {}
+
+
+    AsyncCallback(v8::Isolate *isolate, v8::Local<v8::Function> callback,
+                  CompleteCallback completeCallback) : inner_(
+            std::make_shared<Inner>(isolate, callback, completeCallback)) {
+    }
+
+
+};
+
+#endif

package/platforms/ios/src/cpp/Caches.h

@@ -177,9 +177,77 @@ public:
     std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> WebGLUniformLocationTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
             nullptr);
 
-    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> URLTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> GPUTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
             nullptr);
 
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> GPUAdapterTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+            nullptr);
+
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> GPUSupportedLimitsTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+            nullptr);
+
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> GPUDeviceTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+            nullptr);
+
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> GPUBufferTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+            nullptr);
+
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> GPUCanvasContextTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+            nullptr);
+
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> GPUTextureTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+            nullptr);
+
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> GPUAdapterInfoTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+            nullptr);
+
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> GPUCommandEncoderTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+            nullptr);
+
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> GPUQuerySetTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+            nullptr);
+
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> GPUComputePassEncoderTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+            nullptr);
+
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> GPUShaderModuleTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+            nullptr);
+
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> GPUPipelineLayoutTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+            nullptr);
+
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> GPURenderPipelineTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+            nullptr);
+
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> GPUBindGroupLayoutTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+            nullptr);
+
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> GPUQueueTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+            nullptr);
+
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> GPUTextureViewTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+            nullptr);
+
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> GPURenderPassEncoderTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+            nullptr);
+
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> GPUCommandBufferTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+            nullptr);
+
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> GPUBindGroupTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+            nullptr);
+
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> GPUComputePipelineTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+            nullptr);
+
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> GPUSamplerTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+            nullptr);
+
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> GPURenderBundleEncoderTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+            nullptr);
+
+    std::unique_ptr<v8::Persistent<v8::FunctionTemplate>> GPURenderBundleTmpl = std::unique_ptr<v8::Persistent<v8::FunctionTemplate>>(
+            nullptr);
 
 private:
     static std::shared_ptr<ConcurrentMap<v8::Isolate *,