firefly-compiler 0.5.35 → 0.5.37

package/websocket/.firefly/package.ff

@@ -1 +1 @@
-package ff:websocket:0.0.0
+package ff:websocket:0.0.0

package/websocket/WebSocket.ff

@@ -1,131 +1,100 @@
-capability WebSocket {}
-
-open(browserSystem: BrowserSystem, url: String): WebSocket {
-    internalOpenBrowserWebSocket(browserSystem, url)
-}
-
-extend self: WebSocket {
-    
-    readText(encoding: String = "utf8"): Option[String] {
-        self.readAny {_} {_.toString(encoding)}
-    }
-
-    readBuffer(): Option[Buffer] {
-        self.readAny {_.toBuffer()} {_}
-    }
-    
-    readAny[T](fromText: String => T, fromBuffer: Buffer => T): Option[T]
-        target browser async """
-            ff_core_Task.Task_throwIfAborted($task);
-            while(self_.ffFront.length === 0) {
-                while(self_.ffBack.length !== 0) {
-                    self_.ffFront.push(self_.ffBack.pop());
-                }
-                if(self_.ffFront.length !== 0) break;
-                if(self_.readyState === 3) return ff_core_Option.None();
-                let abort = null;
-                try {
-                    await new Promise((resolve, reject) => {
-                        self_.ffListeners.push(resolve);
-                        if($task !== self_.ffTask) {
-                            abort = () => {
-                                self_.ffListeners = self_.ffListeners.filter(l => l != resolve);
-                                reject();
-                            };
-                            $task.controller.signal.addEventListener('abort', abort);
-                        }
-                    });
-                } finally {
-                    if($task !== self_.ffTask) {
-                        $task.controller.signal.removeEventListener('abort', abort);
-                    }
-                }
-            }
-            const message = self_.ffFront.pop();
-            if(!(message instanceof MessageEvent)) throw new Error("WebSocket error");
-            const data = message.data;
-            if(typeof data === 'string') return ff_core_Option.Some(await fromText_(data));
-            return ff_core_Option.Some(await fromBuffer_(new DataView(data)));
-        """
-
-    writeBuffer(data: Buffer): Unit
-        target browser async """
-            ff_core_Task.Task_throwIfAborted($task);
-            self_.send(data_);
-        """
-
-    writeText(data: String): Unit
-        target browser async """
-            ff_core_Task.Task_throwIfAborted($task);
-            self_.send(data_);
-        """
-        
-    close(code: Int = 1000, reason: String = ""): Unit
-        target browser async """
-            if(self_.readyState === 2 || self_.readyState === 3) return;
-            await new Promise((resolve, reject) => {
-                self_.addEventListener('close', resolve);
-                self_.close(code_, reason !== "" ? reason : void 0);
-            });
-            return;
-        """
-
-    isOpen(): Bool
-        target browser async """
-            return self_.readyState === 1;
-        """
-
-    isClosing(): Bool
-        target browser async """
-            return self_.readyState === 2;
-        """
-
-    isClosed(): Bool
-        target browser async """
-            return self_.readyState === 3;
-        """
-
-}
-
-internalOpenBrowserWebSocket(browserSystem: BrowserSystem, url: String): WebSocket
-    target browser async """
-        if(typeof location !== 'undefined' && !url_.includes("://")) {
-            if(location.href && location.href.startsWith("http")) {
-                url_ = new URL(url_, location.href).href.replace(/^http/, 'ws');
-            }
-        }
-        const socket = new WebSocket(url_);
-        socket.binaryType = "arraybuffer";
-        socket.ffFront = [];
-        socket.ffBack = [];
-        socket.ffListeners = [];
-        socket.ffTask = $task;
-        $task.controller.signal.addEventListener('message', m => socket.ffBack.push(m));
-        const abort = () => socket.close();
-        try {
-            await new Promise((resolve, reject) => {
-                socket.onopen = resolve;
-                socket.onerror = reject;
-                $task.controller.signal.addEventListener('abort', abort);
-            });
-        } finally {
-            socket.onopen = null;
-            socket.onerror = null;
-        }
-        socket.addEventListener('close', () => {
-            $task.controller.signal.removeEventListener('abort', abort);
-            for(let i = 0; i < socket.ffListeners.length; i++) socket.ffListeners[i]();
-            socket.ffListeners.length = 0;
-        });
-        socket.addEventListener('message', m => {
-            socket.ffBack.push(m);
-            for(let i = 0; i < socket.ffListeners.length; i++) socket.ffListeners[i]();
-            socket.ffListeners.length = 0;
-        });
-        socket.addEventListener('error', e => {
-            socket.ffBack.push(e);
-            for(let i = 0; i < socket.ffListeners.length; i++) socket.ffListeners[i]();
-            socket.ffListeners.length = 0;
-        });
-        return socket;
-    """
+capability WebSocket(
+    jsValue: JsValue
+    messages: Queue[JsValue]
+    listeners: Queue[Unit => Unit]
+)
+
+open(browserSystem: BrowserSystem, url: String): WebSocket {
+    let socket = if(
+        Js->location.typeof() != "undefined" && !url.contains("://") &&
+        !Js->location->href.isNullOrUndefined() && Js->location->href->startsWith("http")?
+    ) {
+        let href: String = Js->URL->(url, Js->location->href)->href?
+        Js->WebSocket-> ("ws" + href.dropFirst("http".size()))
+    } else {
+        Js->WebSocket->(url)
+    }
+    socket->binaryType = "arraybuffer"
+    let result = WebSocket(socket, Queue.new(), Queue.new())
+    Js.awaitCancellablePromise {resolve, reject, onSettle =>
+        onSettle {_ => socket->close()}
+        socket->onopen = Js->{resolve(result)}
+        socket->onclose = Js->{reject(_?)}
+    }
+    socket->onopen = Js.null()
+    socket->onclose = Js.null()
+    socket->addEventListener("close", Js->{
+        result.listeners.each {_, listener => listener(Unit)}
+    })
+    socket->addEventListener("message", Js->{m =>
+        result.messages.push(m)
+        result.listeners.each {_, listener => listener(Unit)}
+    })
+    socket->addEventListener("error", Js->{e =>
+        result.messages.push(e)
+        result.listeners.each {_, listener => listener(Unit)}
+    })
+    result
+}
+
+extend self: WebSocket {
+    
+    readText(encoding: String = "utf8"): Option[String] {
+        self.readAny {_} {_.toString(encoding)}
+    }
+
+    readBuffer(): Option[Buffer] {
+        self.readAny {_.toBuffer()} {_}
+    }
+    
+    readAny[T](fromText: String => T, fromBuffer: Buffer => T): Option[T] {
+        Js.throwIfCancelled()
+        doWhile {
+            if(self.messages.size() != 0) {False} else:
+            if(self.jsValue->readyState === 3) {False} else:
+            Js.awaitCancellablePromise {resolve, reject, onSettle =>
+                let key = self.listeners.push(resolve)
+                onSettle {_ => self.listeners.remove(key)}
+            }
+            True
+        }
+        if(self.jsValue->readyState === 3) {None} else:
+        let message = self.messages.pop().grab()
+        if(!(message.instanceof(Js->MessageEvent))) {Js.throw(Js->Error->("WebSocket error"))}
+        let data = message->data
+        if(data.typeof() == "string") {Some(Js.await(fromText(data?)!)?)} else:
+        Some(Js.await(fromBuffer(Js->DataView->(data)?)!)?)
+    }
+            
+    writeBuffer(data: Buffer): Unit {
+        Js.throwIfCancelled()
+        self.jsValue->send(data)
+    }
+
+    writeText(data: String): Unit {
+        Js.throwIfCancelled()
+        self.jsValue->send(data)
+    }
+        
+    close(code: Int = 1000, reason: String = ""): Unit {
+        if(self.jsValue->readyState !== 2 && self.jsValue->readyState !== 3) {
+            Js.await(Js->Promise->(Js->{resolve, reject =>
+                self.jsValue->addEventListener("close", resolve)
+                self.jsValue->close(code, if(reason != "") {reason!} else {Js.undefined()})
+            }))
+        }
+    }
+
+    isOpen(): Bool {
+        self.jsValue->readyState === 1
+    }
+
+    isClosing(): Bool {
+        self.jsValue->readyState === 2
+    }
+
+    isClosed(): Bool {
+        self.jsValue->readyState === 3
+    }
+
+}

package/core/UnsafeJs.ff

@@ -1,42 +0,0 @@
-jsSystem(): JsSystem
-    target js async "return typeof globalThis !== 'undefined' ? globalThis : window"
-    target js sync "return typeof globalThis !== 'undefined' ? globalThis : window"
-
-import(module: String): JsValue
-    // Replaced by the compiler ~ hoisted top level import - dynamic imports not currently supported
-    target js sync "throw Error('Dynamic JS imports are not currently supported.')"
-
-await[T](body: () => T): T // This is never actually called async, but will be rewitten by the compiler
-    // Replaced by the compiler
-    target js sync "return body_()"
-
-throwIfCancelled(): Unit
-    // Replaced by the compiler
-    target js sync ""
-
-cancelled(): Bool
-    // Replaced by the compiler
-    target js sync "return false"
-
-inAsync(): Bool
-    // Replaced by the compiler
-    target js sync "return false"
-    
-inBrowser(): Bool
-    // Replaced by the compiler
-    target js sync "return false"
-    
-inNode(): Bool
-    // Replaced by the compiler
-    target js sync "return false"
-    
-inBuild(): Bool
-    // Replaced by the compiler
-    target js sync "return false"
-    
-value[T](value: T): JsValue
-    target js sync "return value_"
-
-fromValue[T](value: JsValue): T
-    target js sync "return value_"
-

package/output/js/ff/core/UnsafeJs.mjs

@@ -1,191 +0,0 @@
-
-
-import * as ff_core_Any from "../../ff/core/Any.mjs"
-
-import * as ff_core_Array from "../../ff/core/Array.mjs"
-
-import * as ff_core_AssetSystem from "../../ff/core/AssetSystem.mjs"
-
-import * as ff_core_Atomic from "../../ff/core/Atomic.mjs"
-
-import * as ff_core_Bool from "../../ff/core/Bool.mjs"
-
-import * as ff_core_BrowserSystem from "../../ff/core/BrowserSystem.mjs"
-
-import * as ff_core_Buffer from "../../ff/core/Buffer.mjs"
-
-import * as ff_core_BuildSystem from "../../ff/core/BuildSystem.mjs"
-
-import * as ff_core_Channel from "../../ff/core/Channel.mjs"
-
-import * as ff_core_Char from "../../ff/core/Char.mjs"
-
-import * as ff_core_Core from "../../ff/core/Core.mjs"
-
-import * as ff_core_Crypto from "../../ff/core/Crypto.mjs"
-
-import * as ff_core_Duration from "../../ff/core/Duration.mjs"
-
-import * as ff_core_Equal from "../../ff/core/Equal.mjs"
-
-import * as ff_core_Error from "../../ff/core/Error.mjs"
-
-import * as ff_core_FileHandle from "../../ff/core/FileHandle.mjs"
-
-import * as ff_core_Float from "../../ff/core/Float.mjs"
-
-import * as ff_core_HttpClient from "../../ff/core/HttpClient.mjs"
-
-import * as ff_core_Instant from "../../ff/core/Instant.mjs"
-
-import * as ff_core_Int from "../../ff/core/Int.mjs"
-
-import * as ff_core_IntMap from "../../ff/core/IntMap.mjs"
-
-import * as ff_core_JsSystem from "../../ff/core/JsSystem.mjs"
-
-import * as ff_core_JsValue from "../../ff/core/JsValue.mjs"
-
-import * as ff_core_Json from "../../ff/core/Json.mjs"
-
-import * as ff_core_List from "../../ff/core/List.mjs"
-
-import * as ff_core_Lock from "../../ff/core/Lock.mjs"
-
-import * as ff_core_Log from "../../ff/core/Log.mjs"
-
-import * as ff_core_Map from "../../ff/core/Map.mjs"
-
-import * as ff_core_NodeSystem from "../../ff/core/NodeSystem.mjs"
-
-import * as ff_core_Nothing from "../../ff/core/Nothing.mjs"
-
-import * as ff_core_Option from "../../ff/core/Option.mjs"
-
-import * as ff_core_Ordering from "../../ff/core/Ordering.mjs"
-
-import * as ff_core_Pair from "../../ff/core/Pair.mjs"
-
-import * as ff_core_Path from "../../ff/core/Path.mjs"
-
-import * as ff_core_Random from "../../ff/core/Random.mjs"
-
-import * as ff_core_Serializable from "../../ff/core/Serializable.mjs"
-
-import * as ff_core_Set from "../../ff/core/Set.mjs"
-
-import * as ff_core_Show from "../../ff/core/Show.mjs"
-
-import * as ff_core_SourceLocation from "../../ff/core/SourceLocation.mjs"
-
-import * as ff_core_Stream from "../../ff/core/Stream.mjs"
-
-import * as ff_core_String from "../../ff/core/String.mjs"
-
-import * as ff_core_StringMap from "../../ff/core/StringMap.mjs"
-
-import * as ff_core_Task from "../../ff/core/Task.mjs"
-
-import * as ff_core_Try from "../../ff/core/Try.mjs"
-
-import * as ff_core_Unit from "../../ff/core/Unit.mjs"
-
-import * as ff_core_UnsafeJs from "../../ff/core/UnsafeJs.mjs"
-
-
-
-
-
-export function jsSystem_() {
-return typeof globalThis !== 'undefined' ? globalThis : window
-}
-
-export function import_(module_) {
-throw Error('Dynamic JS imports are not currently supported.')
-}
-
-export function await_(body_) {
-return body_()
-}
-
-export function throwIfCancelled_() {
-
-}
-
-export function cancelled_() {
-return false
-}
-
-export function inAsync_() {
-return false
-}
-
-export function inBrowser_() {
-return false
-}
-
-export function inNode_() {
-return false
-}
-
-export function inBuild_() {
-return false
-}
-
-export function value_(value_) {
-return value_
-}
-
-export function fromValue_(value_) {
-return value_
-}
-
-export async function jsSystem_$($task) {
-return typeof globalThis !== 'undefined' ? globalThis : window
-}
-
-export async function import_$(module_, $task) {
-throw new Error('Function import is missing on this target in async context.');
-}
-
-export async function await_$(body_, $task) {
-throw new Error('Function await is missing on this target in async context.');
-}
-
-export async function throwIfCancelled_$($task) {
-throw new Error('Function throwIfCancelled is missing on this target in async context.');
-}
-
-export async function cancelled_$($task) {
-throw new Error('Function cancelled is missing on this target in async context.');
-}
-
-export async function inAsync_$($task) {
-throw new Error('Function inAsync is missing on this target in async context.');
-}
-
-export async function inBrowser_$($task) {
-throw new Error('Function inBrowser is missing on this target in async context.');
-}
-
-export async function inNode_$($task) {
-throw new Error('Function inNode is missing on this target in async context.');
-}
-
-export async function inBuild_$($task) {
-throw new Error('Function inBuild is missing on this target in async context.');
-}
-
-export async function value_$(value_, $task) {
-throw new Error('Function value is missing on this target in async context.');
-}
-
-export async function fromValue_$(value_, $task) {
-throw new Error('Function fromValue is missing on this target in async context.');
-}
-
-
-
-
-
-