@f3liz/rescript-misskey-api 0.6.6 → 0.6.7

package/lib/es6/src/stream/StreamClient.mjs

@@ -1,5 +1,6 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as WebSocket from "../bindings/WebSocket.mjs";
 import * as Stdlib_Dict from "@rescript/runtime/lib/es6/Stdlib_Dict.js";
 import * as StreamProtocol from "./StreamProtocol.mjs";
 import * as Primitive_object from "@rescript/runtime/lib/es6/Primitive_object.js";
@@ -25,11 +26,17 @@ function make(origin, credential, param) {
     idCounter: 0,
     broadcastHandlers: {},
     onConnectedCallback: undefined,
-    onDisconnectedCallback: undefined
+    onDisconnectedCallback: undefined,
+    pendingMessages: []
   };
   ws.addEventListener("open", _event => {
     let isReconnect = stream.state === "reconnecting";
     stream.state = "connected";
+    let pending = stream.pendingMessages;
+    stream.pendingMessages = [];
+    pending.forEach(msg => {
+      stream.ws.send(msg);
+    });
     let cb = stream.onConnectedCallback;
     if (cb !== undefined) {
       cb();
@@ -99,7 +106,11 @@ function make(origin, credential, param) {
 
 function send(stream, msg) {
   let serialized = StreamProtocol.serializeOutgoing(msg);
-  stream.ws.send(serialized);
+  if (WebSocket.isOpen(stream.ws) && stream.pendingMessages.length === 0) {
+    stream.ws.send(serialized);
+  } else {
+    stream.pendingMessages = stream.pendingMessages.concat([serialized]);
+  }
 }
 
 function ping(stream) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@f3liz/rescript-misskey-api",
-  "version": "0.6.6",
+  "version": "0.6.7",
   "description": "ReScript bindings for Misskey API using OpenAPI code generation",
   "keywords": [
     "misskey",

package/src/stream/StreamClient.res

@@ -29,6 +29,7 @@ type t = {
   broadcastHandlers: Dict.t<JSON.t => unit>,
   mutable onConnectedCallback: option<unit => unit>,
   mutable onDisconnectedCallback: option<unit => unit>,
+  mutable pendingMessages: array<string>,
 }
 
 // Generate unique ID for connections
@@ -54,6 +55,7 @@ let make = (~origin: string, ~credential: option<string>=?, ()): t => {
     broadcastHandlers: Dict.make(),
     onConnectedCallback: None,
     onDisconnectedCallback: None,
+    pendingMessages: [],
   }
   
   // Set up WebSocket event handlers
@@ -61,6 +63,11 @@ let make = (~origin: string, ~credential: option<string>=?, ()): t => {
     let isReconnect = stream.state == #reconnecting
     stream.state = #connected
     
+    // Flush any pending messages
+    let pending = stream.pendingMessages
+    stream.pendingMessages = []
+    pending->Array.forEach(msg => stream.ws->WS.send(msg))
+    
     // Call user callback
     switch stream.onConnectedCallback {
     | Some(cb) => cb()
@@ -148,10 +155,15 @@ let make = (~origin: string, ~credential: option<string>=?, ()): t => {
   stream
 }
 
-// Send a message
+// Send a message (queues if WebSocket not yet open)
 let send = (stream: t, msg: Protocol.outgoingMessage): unit => {
   let serialized = Protocol.serializeOutgoing(msg)
-  stream.ws->WS.send(serialized)
+  if WS.isOpen(stream.ws) && Array.length(stream.pendingMessages) == 0 {
+    stream.ws->WS.send(serialized)
+  } else {
+    // Queue for when connection opens or if there are already pending messages
+    stream.pendingMessages = stream.pendingMessages->Array.concat([serialized])
+  }
 }
 
 // Ping the server