@f3liz/rescript-misskey-api 0.6.5 → 0.6.7

package/src/generated/misskey-io/api/MisskeyIoUsers.res

@@ -258,12 +258,12 @@ type postUsersRequest = {
 }
 
 let postUsersRequestSchema = S.object(s => {
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
-    offset: s.fieldOr("offset", S.nullableAsOption(S.int), None),
-    sort: s.fieldOr("sort", S.nullableAsOption(S.string), None),
-    state: s.fieldOr("state", S.nullableAsOption(S.string), None),
-    origin: s.fieldOr("origin", S.nullableAsOption(S.string), None),
-    hostname: s.fieldOr("hostname", S.nullableAsOption(S.string), None),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
+    offset: s.field("offset", S.option(S.int)),
+    sort: s.field("sort", S.option(S.string)),
+    state: s.field("state", S.option(S.string)),
+    origin: s.field("origin", S.option(S.string)),
+    hostname: s.field("hostname", S.option(S.string)),
   })
 
 type postUsersResponse = array<MisskeyIoComponentSchemas.UserDetailed.t>
@@ -299,9 +299,9 @@ type postUsersClipsRequest = {
 
 let postUsersClipsRequestSchema = S.object(s => {
     userId: s.field("userId", S.string),
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
-    sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), None),
-    untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), None),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
+    sinceId: s.field("sinceId", S.option(S.string)),
+    untilId: s.field("untilId", S.option(S.string)),
   })
 
 type postUsersClipsResponse = array<MisskeyIoComponentSchemas.Clip.t>
@@ -337,9 +337,9 @@ type postUsersFlashsRequest = {
 
 let postUsersFlashsRequestSchema = S.object(s => {
     userId: s.field("userId", S.string),
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
-    sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), None),
-    untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), None),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
+    sinceId: s.field("sinceId", S.option(S.string)),
+    untilId: s.field("untilId", S.option(S.string)),
   })
 
 type postUsersFlashsResponse = array<MisskeyIoComponentSchemas.Flash.t>
@@ -376,12 +376,12 @@ type postUsersFollowersRequest = {
 }
 
 let postUsersFollowersRequestSchema = S.object(s => {
-    sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), None),
-    untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), None),
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
-    userId: s.fieldOr("userId", S.nullableAsOption(S.string), None),
-    username: s.fieldOr("username", S.nullableAsOption(S.string), None),
-    host: s.fieldOr("host", S.nullableAsOption(S.string), None),
+    sinceId: s.field("sinceId", S.option(S.string)),
+    untilId: s.field("untilId", S.option(S.string)),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
+    userId: s.field("userId", S.option(S.string)),
+    username: s.field("username", S.option(S.string)),
+    host: s.field("host", S.option(S.string)),
   })
 
 type postUsersFollowersResponse = array<MisskeyIoComponentSchemas.Following.t>
@@ -419,13 +419,13 @@ type postUsersFollowingRequest = {
 }
 
 let postUsersFollowingRequestSchema = S.object(s => {
-    sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), None),
-    untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), None),
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
-    userId: s.fieldOr("userId", S.nullableAsOption(S.string), None),
-    username: s.fieldOr("username", S.nullableAsOption(S.string), None),
-    host: s.fieldOr("host", S.nullableAsOption(S.string), None),
-    birthday: s.fieldOr("birthday", S.nullableAsOption(S.string->S.pattern(/^([0-9]{4})-([0-9]{2})-([0-9]{2})$/)), None),
+    sinceId: s.field("sinceId", S.option(S.string)),
+    untilId: s.field("untilId", S.option(S.string)),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
+    userId: s.field("userId", S.option(S.string)),
+    username: s.field("username", S.option(S.string)),
+    host: s.field("host", S.option(S.string)),
+    birthday: s.field("birthday", S.option(S.string->S.pattern(/^([0-9]{4})-([0-9]{2})-([0-9]{2})$/))),
   })
 
 type postUsersFollowingResponse = array<MisskeyIoComponentSchemas.Following.t>
@@ -461,9 +461,9 @@ type postUsersGalleryPostsRequest = {
 
 let postUsersGalleryPostsRequestSchema = S.object(s => {
     userId: s.field("userId", S.string),
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
-    sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), None),
-    untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), None),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
+    sinceId: s.field("sinceId", S.option(S.string)),
+    untilId: s.field("untilId", S.option(S.string)),
   })
 
 type postUsersGalleryPostsResponse = array<MisskeyIoComponentSchemas.GalleryPost.t>
@@ -514,15 +514,15 @@ let postUsersGetFollowingBirthdayUsersRequest_2Schema = S.object(s => {
   })
 
 let postUsersGetFollowingBirthdayUsersRequest_1Schema = S.object(s => {
-    month: s.fieldOr("month", S.nullableAsOption(S.int->S.min(1)->S.max(12)), None),
-    day: s.fieldOr("day", S.nullableAsOption(S.int->S.min(1)->S.max(31)), None),
-    begin: s.fieldOr("begin", S.nullableAsOption(postUsersGetFollowingBirthdayUsersRequest_2Schema), None),
-    end_: s.fieldOr("end", S.nullableAsOption(postUsersGetFollowingBirthdayUsersRequest_2Schema), None),
+    month: s.field("month", S.option(S.int->S.min(1)->S.max(12))),
+    day: s.field("day", S.option(S.int->S.min(1)->S.max(31))),
+    begin: s.field("begin", S.option(postUsersGetFollowingBirthdayUsersRequest_2Schema)),
+    end_: s.field("end", S.option(postUsersGetFollowingBirthdayUsersRequest_2Schema)),
   })
 
 let postUsersGetFollowingBirthdayUsersRequestSchema = S.object(s => {
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
-    offset: s.fieldOr("offset", S.nullableAsOption(S.int), None),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
+    offset: s.field("offset", S.option(S.int)),
     birthday: s.field("birthday", postUsersGetFollowingBirthdayUsersRequest_1Schema),
   })
 
@@ -567,7 +567,7 @@ type postUsersGetFrequentlyRepliedUsersRequest = {
 
 let postUsersGetFrequentlyRepliedUsersRequestSchema = S.object(s => {
     userId: s.field("userId", S.string),
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
   })
 
 type postUsersGetFrequentlyRepliedUsersResponse_1 = {
@@ -774,16 +774,16 @@ type postUsersNotesRequest = {
 
 let postUsersNotesRequestSchema = S.object(s => {
     userId: s.field("userId", S.string),
-    withReplies: s.fieldOr("withReplies", S.nullableAsOption(S.bool), None),
-    withRenotes: s.fieldOr("withRenotes", S.nullableAsOption(S.bool), None),
-    withChannelNotes: s.fieldOr("withChannelNotes", S.nullableAsOption(S.bool), None),
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
-    sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), None),
-    untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), None),
-    sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), None),
-    untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), None),
-    allowPartial: s.fieldOr("allowPartial", S.nullableAsOption(S.bool), None),
-    withFiles: s.fieldOr("withFiles", S.nullableAsOption(S.bool), None),
+    withReplies: s.field("withReplies", S.option(S.bool)),
+    withRenotes: s.field("withRenotes", S.option(S.bool)),
+    withChannelNotes: s.field("withChannelNotes", S.option(S.bool)),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
+    sinceId: s.field("sinceId", S.option(S.string)),
+    untilId: s.field("untilId", S.option(S.string)),
+    sinceDate: s.field("sinceDate", S.option(S.int)),
+    untilDate: s.field("untilDate", S.option(S.int)),
+    allowPartial: s.field("allowPartial", S.option(S.bool)),
+    withFiles: s.field("withFiles", S.option(S.bool)),
   })
 
 type postUsersNotesResponse = array<MisskeyIoComponentSchemas.Note.t>
@@ -819,9 +819,9 @@ type postUsersPagesRequest = {
 
 let postUsersPagesRequestSchema = S.object(s => {
     userId: s.field("userId", S.string),
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
-    sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), None),
-    untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), None),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
+    sinceId: s.field("sinceId", S.option(S.string)),
+    untilId: s.field("untilId", S.option(S.string)),
   })
 
 type postUsersPagesResponse = array<MisskeyIoComponentSchemas.Page.t>
@@ -859,11 +859,11 @@ type postUsersReactionsRequest = {
 
 let postUsersReactionsRequestSchema = S.object(s => {
     userId: s.field("userId", S.string),
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
-    sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), None),
-    untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), None),
-    sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), None),
-    untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), None),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
+    sinceId: s.field("sinceId", S.option(S.string)),
+    untilId: s.field("untilId", S.option(S.string)),
+    sinceDate: s.field("sinceDate", S.option(S.int)),
+    untilDate: s.field("untilDate", S.option(S.int)),
   })
 
 type postUsersReactionsResponse = array<MisskeyIoComponentSchemas.NoteReaction.t>
@@ -896,8 +896,8 @@ type postUsersRecommendationRequest = {
 }
 
 let postUsersRecommendationRequestSchema = S.object(s => {
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
-    offset: s.fieldOr("offset", S.nullableAsOption(S.int), None),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
+    offset: s.field("offset", S.option(S.int)),
   })
 
 type postUsersRecommendationResponse = array<MisskeyIoComponentSchemas.UserDetailed.t>
@@ -989,7 +989,7 @@ type postUsersReportAbuseRequest = {
 let postUsersReportAbuseRequestSchema = S.object(s => {
     userId: s.field("userId", S.string),
     comment: s.field("comment", S.string->S.min(1)->S.max(2048)),
-    category: s.fieldOr("category", S.nullableAsOption(S.string), None),
+    category: s.field("category", S.option(S.string)),
   })
 
 type postUsersReportAbuseResponse = unit
@@ -1024,10 +1024,10 @@ type postUsersSearchRequest = {
 
 let postUsersSearchRequestSchema = S.object(s => {
     query: s.field("query", S.string),
-    offset: s.fieldOr("offset", S.nullableAsOption(S.int), None),
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
-    origin: s.fieldOr("origin", S.nullableAsOption(S.string), None),
-    detail: s.fieldOr("detail", S.nullableAsOption(S.bool), None),
+    offset: s.field("offset", S.option(S.int)),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
+    origin: s.field("origin", S.option(S.string)),
+    detail: s.field("detail", S.option(S.bool)),
   })
 
 type postUsersSearchResponse = array<MisskeyIoComponentSchemas.User.t>
@@ -1062,10 +1062,10 @@ type postUsersSearchByUsernameAndHostRequest = {
 }
 
 let postUsersSearchByUsernameAndHostRequestSchema = S.object(s => {
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
-    detail: s.fieldOr("detail", S.nullableAsOption(S.bool), None),
-    username: s.fieldOr("username", S.nullableAsOption(S.string), None),
-    host: s.fieldOr("host", S.nullableAsOption(S.string), None),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
+    detail: s.field("detail", S.option(S.bool)),
+    username: s.field("username", S.option(S.string)),
+    host: s.field("host", S.option(S.string)),
   })
 
 type postUsersSearchByUsernameAndHostResponse = array<MisskeyIoComponentSchemas.User.t>
@@ -1101,11 +1101,11 @@ type postUsersShowRequest = {
 }
 
 let postUsersShowRequestSchema = S.object(s => {
-    userId: s.fieldOr("userId", S.nullableAsOption(S.string), None),
-    userIds: s.fieldOr("userIds", S.nullableAsOption(S.array(S.string)), None),
-    username: s.fieldOr("username", S.nullableAsOption(S.string), None),
-    host: s.fieldOr("host", S.nullableAsOption(S.string), None),
-    detailed: s.fieldOr("detailed", S.nullableAsOption(S.bool), None),
+    userId: s.field("userId", S.option(S.string)),
+    userIds: s.field("userIds", S.option(S.array(S.string))),
+    username: s.field("username", S.option(S.string)),
+    host: s.field("host", S.option(S.string)),
+    detailed: s.field("detailed", S.option(S.bool)),
   })
 
 type postUsersShowResponse = array<MisskeyIoComponentSchemas.UserDetailed.t>

package/src/generated/misskey-io/api/MisskeyIoWebhooks.res

@@ -17,14 +17,14 @@ type postAdminSystemWebhookTestRequest = {
 }
 
 let postAdminSystemWebhookTestRequest_1Schema = S.object(s => {
-    url: s.fieldOr("url", S.nullableAsOption(S.string), None),
-    secret: s.fieldOr("secret", S.nullableAsOption(S.string), None),
+    url: s.field("url", S.option(S.string)),
+    secret: s.field("secret", S.option(S.string)),
   })
 
 let postAdminSystemWebhookTestRequestSchema = S.object(s => {
     webhookId: s.field("webhookId", S.string),
     type_: s.field("type", S.string),
-    override: s.fieldOr("override", S.nullableAsOption(postAdminSystemWebhookTestRequest_1Schema), None),
+    override: s.field("override", S.option(postAdminSystemWebhookTestRequest_1Schema)),
   })
 
 type postAdminSystemWebhookTestResponse = unit
@@ -60,7 +60,7 @@ type postIWebhooksCreateRequest = {
 let postIWebhooksCreateRequestSchema = S.object(s => {
     name: s.field("name", S.string->S.min(1)->S.max(100)),
     url: s.field("url", S.string->S.min(1)->S.max(1024)),
-    secret: s.fieldOr("secret", S.nullableAsOption(S.string->S.max(1024)), None),
+    secret: s.field("secret", S.option(S.string->S.max(1024))),
     on: s.field("on", S.array(S.string)),
   })
 
@@ -250,14 +250,14 @@ type postIWebhooksTestRequest = {
 }
 
 let postIWebhooksTestRequest_1Schema = S.object(s => {
-    url: s.fieldOr("url", S.nullableAsOption(S.string), None),
-    secret: s.fieldOr("secret", S.nullableAsOption(S.string), None),
+    url: s.field("url", S.option(S.string)),
+    secret: s.field("secret", S.option(S.string)),
   })
 
 let postIWebhooksTestRequestSchema = S.object(s => {
     webhookId: s.field("webhookId", S.string),
     type_: s.field("type", S.string),
-    override: s.fieldOr("override", S.nullableAsOption(postIWebhooksTestRequest_1Schema), None),
+    override: s.field("override", S.option(postIWebhooksTestRequest_1Schema)),
   })
 
 type postIWebhooksTestResponse = unit
@@ -294,11 +294,11 @@ type postIWebhooksUpdateRequest = {
 
 let postIWebhooksUpdateRequestSchema = S.object(s => {
     webhookId: s.field("webhookId", S.string),
-    name: s.fieldOr("name", S.nullableAsOption(S.string->S.min(1)->S.max(100)), None),
-    url: s.fieldOr("url", S.nullableAsOption(S.string->S.min(1)->S.max(1024)), None),
-    secret: s.fieldOr("secret", S.nullableAsOption(S.string->S.max(1024)), None),
-    on: s.fieldOr("on", S.nullableAsOption(S.array(S.string)), None),
-    active: s.fieldOr("active", S.nullableAsOption(S.bool), None),
+    name: s.field("name", S.option(S.string->S.min(1)->S.max(100))),
+    url: s.field("url", S.option(S.string->S.min(1)->S.max(1024))),
+    secret: s.field("secret", S.option(S.string->S.max(1024))),
+    on: s.field("on", S.option(S.array(S.string))),
+    active: s.field("active", S.option(S.bool)),
   })
 
 type postIWebhooksUpdateResponse = unit

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