@f3liz/rescript-misskey-api 0.6.5 → 0.6.7

package/lib/es6/src/generated/misskey-io/api/MisskeyIoUsers.mjs

@@ -88,12 +88,12 @@ function postUsernameAvailable(body, fetch) {
 }
 
 let postUsersRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  offset: s.fieldOr("offset", S.nullableAsOption(S.int), undefined),
-  sort: s.fieldOr("sort", S.nullableAsOption(S.string), undefined),
-  state: s.fieldOr("state", S.nullableAsOption(S.string), undefined),
-  origin: s.fieldOr("origin", S.nullableAsOption(S.string), undefined),
-  hostname: s.fieldOr("hostname", S.nullableAsOption(S.string), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  offset: s.f("offset", S.option(S.int)),
+  sort: s.f("sort", S.option(S.string)),
+  state: s.f("state", S.option(S.string)),
+  origin: s.f("origin", S.option(S.string)),
+  hostname: s.f("hostname", S.option(S.string))
 }));
 
 let postUsersResponseSchema = S.array(MisskeyIoComponentSchemas.UserDetailed.schema);
@@ -105,9 +105,9 @@ function postUsers(body, fetch) {
 
 let postUsersClipsRequestSchema = S.object(s => ({
   userId: s.f("userId", S.string),
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string))
 }));
 
 let postUsersClipsResponseSchema = S.array(MisskeyIoComponentSchemas.Clip.schema);
@@ -119,9 +119,9 @@ function postUsersClips(body, fetch) {
 
 let postUsersFlashsRequestSchema = S.object(s => ({
   userId: s.f("userId", S.string),
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string))
 }));
 
 let postUsersFlashsResponseSchema = S.array(MisskeyIoComponentSchemas.Flash.schema);
@@ -132,12 +132,12 @@ function postUsersFlashs(body, fetch) {
 }
 
 let postUsersFollowersRequestSchema = S.object(s => ({
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined),
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  userId: s.fieldOr("userId", S.nullableAsOption(S.string), undefined),
-  username: s.fieldOr("username", S.nullableAsOption(S.string), undefined),
-  host: s.fieldOr("host", S.nullableAsOption(S.string), undefined)
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string)),
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  userId: s.f("userId", S.option(S.string)),
+  username: s.f("username", S.option(S.string)),
+  host: s.f("host", S.option(S.string))
 }));
 
 let postUsersFollowersResponseSchema = S.array(MisskeyIoComponentSchemas.Following.schema);
@@ -148,13 +148,13 @@ function postUsersFollowers(body, fetch) {
 }
 
 let postUsersFollowingRequestSchema = S.object(s => ({
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined),
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  userId: s.fieldOr("userId", S.nullableAsOption(S.string), undefined),
-  username: s.fieldOr("username", S.nullableAsOption(S.string), undefined),
-  host: s.fieldOr("host", S.nullableAsOption(S.string), undefined),
-  birthday: s.fieldOr("birthday", S.nullableAsOption(S.pattern(S.string, /^([0-9]{4})-([0-9]{2})-([0-9]{2})$/, undefined)), undefined)
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string)),
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  userId: s.f("userId", S.option(S.string)),
+  username: s.f("username", S.option(S.string)),
+  host: s.f("host", S.option(S.string)),
+  birthday: s.f("birthday", S.option(S.pattern(S.string, /^([0-9]{4})-([0-9]{2})-([0-9]{2})$/, undefined)))
 }));
 
 let postUsersFollowingResponseSchema = S.array(MisskeyIoComponentSchemas.Following.schema);
@@ -166,9 +166,9 @@ function postUsersFollowing(body, fetch) {
 
 let postUsersGalleryPostsRequestSchema = S.object(s => ({
   userId: s.f("userId", S.string),
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string))
 }));
 
 let postUsersGalleryPostsResponseSchema = S.array(MisskeyIoComponentSchemas.GalleryPost.schema);
@@ -184,15 +184,15 @@ let postUsersGetFollowingBirthdayUsersRequest_2Schema = S.object(s => ({
 }));
 
 let postUsersGetFollowingBirthdayUsersRequest_1Schema = S.object(s => ({
-  month: s.fieldOr("month", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 12, undefined)), undefined),
-  day: s.fieldOr("day", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 31, undefined)), undefined),
-  begin: s.fieldOr("begin", S.nullableAsOption(postUsersGetFollowingBirthdayUsersRequest_2Schema), undefined),
-  end: s.fieldOr("end", S.nullableAsOption(postUsersGetFollowingBirthdayUsersRequest_2Schema), undefined)
+  month: s.f("month", S.option(S.max(S.min(S.int, 1, undefined), 12, undefined))),
+  day: s.f("day", S.option(S.max(S.min(S.int, 1, undefined), 31, undefined))),
+  begin: s.f("begin", S.option(postUsersGetFollowingBirthdayUsersRequest_2Schema)),
+  end: s.f("end", S.option(postUsersGetFollowingBirthdayUsersRequest_2Schema))
 }));
 
 let postUsersGetFollowingBirthdayUsersRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  offset: s.fieldOr("offset", S.nullableAsOption(S.int), undefined),
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  offset: s.f("offset", S.option(S.int)),
   birthday: s.f("birthday", postUsersGetFollowingBirthdayUsersRequest_1Schema)
 }));
 
@@ -210,7 +210,7 @@ function postUsersGetFollowingBirthdayUsers(body, fetch) {
 
 let postUsersGetFrequentlyRepliedUsersRequestSchema = S.object(s => ({
   userId: s.f("userId", S.string),
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined)))
 }));
 
 let postUsersGetFrequentlyRepliedUsersResponse_1Schema = S.object(s => ({
@@ -289,16 +289,16 @@ function postUsersGetSkebStatus(body, fetch) {
 
 let postUsersNotesRequestSchema = S.object(s => ({
   userId: s.f("userId", S.string),
-  withReplies: s.fieldOr("withReplies", S.nullableAsOption(S.bool), undefined),
-  withRenotes: s.fieldOr("withRenotes", S.nullableAsOption(S.bool), undefined),
-  withChannelNotes: s.fieldOr("withChannelNotes", S.nullableAsOption(S.bool), undefined),
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), undefined),
-  allowPartial: s.fieldOr("allowPartial", S.nullableAsOption(S.bool), undefined),
-  withFiles: s.fieldOr("withFiles", S.nullableAsOption(S.bool), undefined)
+  withReplies: s.f("withReplies", S.option(S.bool)),
+  withRenotes: s.f("withRenotes", S.option(S.bool)),
+  withChannelNotes: s.f("withChannelNotes", S.option(S.bool)),
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int)),
+  allowPartial: s.f("allowPartial", S.option(S.bool)),
+  withFiles: s.f("withFiles", S.option(S.bool))
 }));
 
 let postUsersNotesResponseSchema = S.array(MisskeyIoComponentSchemas.Note.schema);
@@ -310,9 +310,9 @@ function postUsersNotes(body, fetch) {
 
 let postUsersPagesRequestSchema = S.object(s => ({
   userId: s.f("userId", S.string),
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string))
 }));
 
 let postUsersPagesResponseSchema = S.array(MisskeyIoComponentSchemas.Page.schema);
@@ -324,11 +324,11 @@ function postUsersPages(body, fetch) {
 
 let postUsersReactionsRequestSchema = S.object(s => ({
   userId: s.f("userId", S.string),
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int))
 }));
 
 let postUsersReactionsResponseSchema = S.array(MisskeyIoComponentSchemas.NoteReaction.schema);
@@ -339,8 +339,8 @@ function postUsersReactions(body, fetch) {
 }
 
 let postUsersRecommendationRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  offset: s.fieldOr("offset", S.nullableAsOption(S.int), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  offset: s.f("offset", S.option(S.int))
 }));
 
 let postUsersRecommendationResponseSchema = S.array(MisskeyIoComponentSchemas.UserDetailed.schema);
@@ -376,7 +376,7 @@ function postUsersRelation(body, fetch) {
 let postUsersReportAbuseRequestSchema = S.object(s => ({
   userId: s.f("userId", S.string),
   comment: s.f("comment", S.max(S.min(S.string, 1, undefined), 2048, undefined)),
-  category: s.fieldOr("category", S.nullableAsOption(S.string), undefined)
+  category: s.f("category", S.option(S.string))
 }));
 
 function postUsersReportAbuse(body, fetch) {
@@ -386,10 +386,10 @@ function postUsersReportAbuse(body, fetch) {
 
 let postUsersSearchRequestSchema = S.object(s => ({
   query: s.f("query", S.string),
-  offset: s.fieldOr("offset", S.nullableAsOption(S.int), undefined),
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  origin: s.fieldOr("origin", S.nullableAsOption(S.string), undefined),
-  detail: s.fieldOr("detail", S.nullableAsOption(S.bool), undefined)
+  offset: s.f("offset", S.option(S.int)),
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  origin: s.f("origin", S.option(S.string)),
+  detail: s.f("detail", S.option(S.bool))
 }));
 
 let postUsersSearchResponseSchema = S.array(MisskeyIoComponentSchemas.User.schema);
@@ -400,10 +400,10 @@ function postUsersSearch(body, fetch) {
 }
 
 let postUsersSearchByUsernameAndHostRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  detail: s.fieldOr("detail", S.nullableAsOption(S.bool), undefined),
-  username: s.fieldOr("username", S.nullableAsOption(S.string), undefined),
-  host: s.fieldOr("host", S.nullableAsOption(S.string), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  detail: s.f("detail", S.option(S.bool)),
+  username: s.f("username", S.option(S.string)),
+  host: s.f("host", S.option(S.string))
 }));
 
 let postUsersSearchByUsernameAndHostResponseSchema = S.array(MisskeyIoComponentSchemas.User.schema);
@@ -414,11 +414,11 @@ function postUsersSearchByUsernameAndHost(body, fetch) {
 }
 
 let postUsersShowRequestSchema = S.object(s => ({
-  userId: s.fieldOr("userId", S.nullableAsOption(S.string), undefined),
-  userIds: s.fieldOr("userIds", S.nullableAsOption(S.array(S.string)), undefined),
-  username: s.fieldOr("username", S.nullableAsOption(S.string), undefined),
-  host: s.fieldOr("host", S.nullableAsOption(S.string), undefined),
-  detailed: s.fieldOr("detailed", S.nullableAsOption(S.bool), undefined)
+  userId: s.f("userId", S.option(S.string)),
+  userIds: s.f("userIds", S.option(S.array(S.string))),
+  username: s.f("username", S.option(S.string)),
+  host: s.f("host", S.option(S.string)),
+  detailed: s.f("detailed", S.option(S.bool))
 }));
 
 let postUsersShowResponseSchema = S.array(MisskeyIoComponentSchemas.UserDetailed.schema);

package/lib/es6/src/generated/misskey-io/api/MisskeyIoWebhooks.mjs

@@ -5,14 +5,14 @@ import * as S from "sury/lib/es6/src/S.mjs";
 S.enableJson();
 
 let postAdminSystemWebhookTestRequest_1Schema = S.object(s => ({
-  url: s.fieldOr("url", S.nullableAsOption(S.string), undefined),
-  secret: s.fieldOr("secret", S.nullableAsOption(S.string), undefined)
+  url: s.f("url", S.option(S.string)),
+  secret: s.f("secret", S.option(S.string))
 }));
 
 let postAdminSystemWebhookTestRequestSchema = S.object(s => ({
   webhookId: s.f("webhookId", S.string),
   type: s.f("type", S.string),
-  override: s.fieldOr("override", S.nullableAsOption(postAdminSystemWebhookTestRequest_1Schema), undefined)
+  override: s.f("override", S.option(postAdminSystemWebhookTestRequest_1Schema))
 }));
 
 function postAdminSystemWebhookTest(body, fetch) {
@@ -23,7 +23,7 @@ function postAdminSystemWebhookTest(body, fetch) {
 let postIWebhooksCreateRequestSchema = S.object(s => ({
   name: s.f("name", S.max(S.min(S.string, 1, undefined), 100, undefined)),
   url: s.f("url", S.max(S.min(S.string, 1, undefined), 1024, undefined)),
-  secret: s.fieldOr("secret", S.nullableAsOption(S.max(S.string, 1024, undefined)), undefined),
+  secret: s.f("secret", S.option(S.max(S.string, 1024, undefined))),
   on: s.f("on", S.array(S.string))
 }));
 
@@ -93,14 +93,14 @@ function postIWebhooksShow(body, fetch) {
 }
 
 let postIWebhooksTestRequest_1Schema = S.object(s => ({
-  url: s.fieldOr("url", S.nullableAsOption(S.string), undefined),
-  secret: s.fieldOr("secret", S.nullableAsOption(S.string), undefined)
+  url: s.f("url", S.option(S.string)),
+  secret: s.f("secret", S.option(S.string))
 }));
 
 let postIWebhooksTestRequestSchema = S.object(s => ({
   webhookId: s.f("webhookId", S.string),
   type: s.f("type", S.string),
-  override: s.fieldOr("override", S.nullableAsOption(postIWebhooksTestRequest_1Schema), undefined)
+  override: s.f("override", S.option(postIWebhooksTestRequest_1Schema))
 }));
 
 function postIWebhooksTest(body, fetch) {
@@ -110,11 +110,11 @@ function postIWebhooksTest(body, fetch) {
 
 let postIWebhooksUpdateRequestSchema = S.object(s => ({
   webhookId: s.f("webhookId", S.string),
-  name: s.fieldOr("name", S.nullableAsOption(S.max(S.min(S.string, 1, undefined), 100, undefined)), undefined),
-  url: s.fieldOr("url", S.nullableAsOption(S.max(S.min(S.string, 1, undefined), 1024, undefined)), undefined),
-  secret: s.fieldOr("secret", S.nullableAsOption(S.max(S.string, 1024, undefined)), undefined),
-  on: s.fieldOr("on", S.nullableAsOption(S.array(S.string)), undefined),
-  active: s.fieldOr("active", S.nullableAsOption(S.bool), undefined)
+  name: s.f("name", S.option(S.max(S.min(S.string, 1, undefined), 100, undefined))),
+  url: s.f("url", S.option(S.max(S.min(S.string, 1, undefined), 1024, undefined))),
+  secret: s.f("secret", S.option(S.max(S.string, 1024, undefined))),
+  on: s.f("on", S.option(S.array(S.string))),
+  active: s.f("active", S.option(S.bool))
 }));
 
 function postIWebhooksUpdate(body, fetch) {

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.5",
+  "version": "0.6.7",
   "description": "ReScript bindings for Misskey API using OpenAPI code generation",
   "keywords": [
     "misskey",
@@ -42,7 +42,7 @@
     "sury": "11.0.0-alpha.4"
   },
   "devDependencies": {
-    "@f3liz/rescript-autogen-openapi": "^0.5.3",
+    "@f3liz/rescript-autogen-openapi": "^0.5.4",
     "rescript": "^12.1.0",
     "typescript": "^5.9.3"
   },