@f3liz/rescript-misskey-api 0.6.8 → 0.7.0

package/lib/es6/src/Misskey.mjs

@@ -1,12 +1,12 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 import * as S from "sury/lib/es6/src/S.mjs";
+import * as Ofetch from "ofetch";
 import * as Stdlib_JSON from "@rescript/runtime/lib/es6/Stdlib_JSON.js";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
 import * as StreamClient from "./stream/StreamClient.mjs";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
-import * as Stdlib_Promise from "@rescript/runtime/lib/es6/Stdlib_Promise.js";
 import * as MisskeyIoWrapper from "./generated/misskey-io/MisskeyIoWrapper.mjs";
 import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
 import * as StreamConnection from "./stream/StreamConnection.mjs";
@@ -14,47 +14,35 @@ import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_excep
 
 S.enableJson();
 
-let FetchBindings = {};
+function injectToken(body, token) {
+  if (body !== undefined) {
+    if (token === undefined) {
+      return body;
+    }
+    let obj = Stdlib_JSON.Decode.object(body);
+    if (obj !== undefined) {
+      obj["i"] = token;
+      return obj;
+    } else {
+      return body;
+    }
+  }
+  if (token === undefined) {
+    return body;
+  }
+  let obj$1 = {};
+  obj$1["i"] = token;
+  return obj$1;
+}
 
 function defaultFetch(origin, token) {
   return (url, method_, body) => {
-    let fullUrl = origin + `/api/` + url;
-    let bodyWithToken;
-    if (body !== undefined) {
-      if (token !== undefined) {
-        let obj = Stdlib_JSON.Decode.object(body);
-        if (obj !== undefined) {
-          obj["i"] = token;
-          bodyWithToken = obj;
-        } else {
-          bodyWithToken = body;
-        }
-      } else {
-        bodyWithToken = body;
-      }
-    } else if (token !== undefined) {
-      let obj$1 = {};
-      obj$1["i"] = token;
-      bodyWithToken = obj$1;
-    } else {
-      bodyWithToken = body;
-    }
-    let bodyStr = Stdlib_Option.map(bodyWithToken, json => JSON.stringify(json));
-    let headers = {};
-    headers["Content-Type"] = "application/json";
-    return fetch(fullUrl, {
+    let bodyWithToken = injectToken(body, token);
+    return Ofetch.ofetch(url, {
+      baseURL: origin + `/api`,
       method: method_,
-      headers: headers,
-      body: bodyStr
-    }).then(response => {
-      if (response.ok) {
-        return response.json();
-      }
-      let msg = `API error: ` + response.status.toString() + ` ` + response.statusText;
-      return Promise.reject({
-        RE_EXN_ID: "JsExn",
-        _1: new Error(msg)
-      });
+      body: bodyWithToken,
+      retry: 0
     });
   };
 }
@@ -73,19 +61,23 @@ function wrapperConnect(client) {
   return MisskeyIoWrapper.connect(client.origin, client.token, client.fetchFn, undefined);
 }
 
-function request(client, endpoint, paramsOpt, param) {
+async function request(client, endpoint, paramsOpt, param) {
   let params = paramsOpt !== undefined ? paramsOpt : ({});
-  return Stdlib_Promise.$$catch(client.fetchFn(endpoint, "POST", params).then(json => Promise.resolve({
-    TAG: "Ok",
-    _0: json
-  })), err => {
+  try {
+    let json = await client.fetchFn(endpoint, "POST", params);
+    return {
+      TAG: "Ok",
+      _0: json
+    };
+  } catch (raw_err) {
+    let err = Primitive_exceptions.internalToException(raw_err);
     let jsExn = Stdlib_JsExn.fromException(err);
     let msg = jsExn !== undefined ? Stdlib_Option.getOr(Stdlib_JsExn.message(Primitive_option.valFromOption(jsExn)), "Unknown error") : "Unknown error";
-    return Promise.resolve({
+    return {
       TAG: "Error",
       _0: msg
-    });
-  });
+    };
+  }
 }
 
 function currentUser(client) {
@@ -131,7 +123,7 @@ function $$delete(client, noteId) {
   return request(client, "notes/delete", params, undefined);
 }
 
-function fetch$1(client, type_, limitOpt, sinceId, untilId, param) {
+function fetch(client, type_, limitOpt, sinceId, untilId, param) {
   let limit = limitOpt !== undefined ? limitOpt : 10;
   let match;
   if (typeof type_ === "object") {
@@ -209,8 +201,8 @@ function unreact(client, noteId) {
 let Notes = {
   create: create,
   $$delete: $$delete,
-  fetch: fetch$1,
-  timeline: fetch$1,
+  fetch: fetch,
+  timeline: fetch,
   react: react,
   unreact: unreact
 };
@@ -337,34 +329,33 @@ function decodeCustomEmoji(json) {
   };
 }
 
-function list(client) {
-  return request(client, "emojis", undefined, undefined).then(result => {
-    let tmp;
-    if (result.TAG === "Ok") {
-      let obj = Stdlib_JSON.Decode.object(result._0);
-      if (obj !== undefined) {
-        let emojisArray = Stdlib_Option.flatMap(obj["emojis"], Stdlib_JSON.Decode.array);
-        tmp = emojisArray !== undefined ? ({
-            TAG: "Ok",
-            _0: Stdlib_Array.filterMap(emojisArray, decodeCustomEmoji)
-          }) : ({
-            TAG: "Ok",
-            _0: []
-          });
-      } else {
-        tmp = {
-          TAG: "Ok",
-          _0: []
-        };
-      }
-    } else {
-      tmp = {
-        TAG: "Error",
-        _0: result._0
-      };
-    }
-    return Promise.resolve(tmp);
-  });
+async function list(client) {
+  let result = await request(client, "emojis", undefined, undefined);
+  if (result.TAG !== "Ok") {
+    return {
+      TAG: "Error",
+      _0: result._0
+    };
+  }
+  let obj = Stdlib_JSON.Decode.object(result._0);
+  if (obj === undefined) {
+    return {
+      TAG: "Ok",
+      _0: []
+    };
+  }
+  let emojisArray = Stdlib_Option.flatMap(obj["emojis"], Stdlib_JSON.Decode.array);
+  if (emojisArray !== undefined) {
+    return {
+      TAG: "Ok",
+      _0: Stdlib_Array.filterMap(emojisArray, decodeCustomEmoji)
+    };
+  } else {
+    return {
+      TAG: "Ok",
+      _0: []
+    };
+  }
 }
 
 let Emojis = {
@@ -372,70 +363,70 @@ let Emojis = {
   list: list
 };
 
-function antennas(client) {
-  return request(client, "antennas/list", undefined, undefined).then(result => {
-    let tmp;
-    if (result.TAG === "Ok") {
-      let arr = Stdlib_JSON.Decode.array(result._0);
-      tmp = arr !== undefined ? ({
-          TAG: "Ok",
-          _0: arr
-        }) : ({
-          TAG: "Ok",
-          _0: []
-        });
-    } else {
-      tmp = {
-        TAG: "Error",
-        _0: result._0
-      };
-    }
-    return Promise.resolve(tmp);
-  });
+async function antennas(client) {
+  let result = await request(client, "antennas/list", undefined, undefined);
+  if (result.TAG !== "Ok") {
+    return {
+      TAG: "Error",
+      _0: result._0
+    };
+  }
+  let arr = Stdlib_JSON.Decode.array(result._0);
+  if (arr !== undefined) {
+    return {
+      TAG: "Ok",
+      _0: arr
+    };
+  } else {
+    return {
+      TAG: "Ok",
+      _0: []
+    };
+  }
 }
 
-function lists(client) {
-  return request(client, "users/lists/list", undefined, undefined).then(result => {
-    let tmp;
-    if (result.TAG === "Ok") {
-      let arr = Stdlib_JSON.Decode.array(result._0);
-      tmp = arr !== undefined ? ({
-          TAG: "Ok",
-          _0: arr
-        }) : ({
-          TAG: "Ok",
-          _0: []
-        });
-    } else {
-      tmp = {
-        TAG: "Error",
-        _0: result._0
-      };
-    }
-    return Promise.resolve(tmp);
-  });
+async function lists(client) {
+  let result = await request(client, "users/lists/list", undefined, undefined);
+  if (result.TAG !== "Ok") {
+    return {
+      TAG: "Error",
+      _0: result._0
+    };
+  }
+  let arr = Stdlib_JSON.Decode.array(result._0);
+  if (arr !== undefined) {
+    return {
+      TAG: "Ok",
+      _0: arr
+    };
+  } else {
+    return {
+      TAG: "Ok",
+      _0: []
+    };
+  }
 }
 
-function channels(client) {
-  return request(client, "channels/followed", undefined, undefined).then(result => {
-    let tmp;
-    if (result.TAG === "Ok") {
-      let arr = Stdlib_JSON.Decode.array(result._0);
-      tmp = arr !== undefined ? ({
-          TAG: "Ok",
-          _0: arr
-        }) : ({
-          TAG: "Ok",
-          _0: []
-        });
-    } else {
-      tmp = {
-        TAG: "Error",
-        _0: result._0
-      };
-    }
-    return Promise.resolve(tmp);
-  });
+async function channels(client) {
+  let result = await request(client, "channels/followed", undefined, undefined);
+  if (result.TAG !== "Ok") {
+    return {
+      TAG: "Error",
+      _0: result._0
+    };
+  }
+  let arr = Stdlib_JSON.Decode.array(result._0);
+  if (arr !== undefined) {
+    return {
+      TAG: "Ok",
+      _0: arr
+    };
+  } else {
+    return {
+      TAG: "Ok",
+      _0: []
+    };
+  }
 }
 
 function extractIdAndName(item) {
@@ -535,11 +526,7 @@ function permissionToString(perm) {
 }
 
 function generateSessionId() {
-  return (function() {
-        var a = new Uint8Array(16);
-        crypto.getRandomValues(a);
-        return Array.from(a, function(b) { return b.toString(16).padStart(2, '0'); }).join('');
-      }());
+  return crypto.randomUUID().replaceAll("-", "");
 }
 
 function generateUrl(origin, name, permissions, callback, icon, param) {
@@ -559,21 +546,11 @@ function generateUrl(origin, name, permissions, callback, icon, param) {
 
 async function check(origin, sessionId) {
   try {
-    let url = origin + `/api/miauth/` + sessionId + `/check`;
-    let headers = {};
-    headers["Content-Type"] = "application/json";
-    let response = await fetch(url, {
+    let json = await Ofetch.ofetch(origin + `/api/miauth/` + sessionId + `/check`, {
       method: "POST",
-      headers: headers,
-      body: "{}"
+      body: {},
+      retry: 0
     });
-    if (!response.ok) {
-      return {
-        TAG: "Error",
-        _0: `HTTP error: ` + response.status.toString() + ` ` + response.statusText
-      };
-    }
-    let json = await response.json();
     let obj = Stdlib_JSON.Decode.object(json);
     if (obj === undefined) {
       return {
@@ -657,7 +634,7 @@ function isAPIError(error) {
 let $$default = connect;
 
 export {
-  FetchBindings,
+  injectToken,
   defaultFetch,
   connect,
   wrapperConnect,

package/lib/es6/src/bindings/Ofetch.mjs

@@ -0,0 +1,2 @@
+// Generated by ReScript, PLEASE EDIT WITH CARE
+/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */