@n1xyz/nord-ts 0.1.0 → 0.1.1

package/dist/gen/openapi.d.ts

@@ -136,6 +136,14 @@ export interface paths {
                         "application/octet-stream": unknown;
                     };
                 };
+                413: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["PayloadTooLarge"];
+                    };
+                };
                 415: {
                     headers: {
                         /**
@@ -1910,6 +1918,10 @@ export interface components {
         AcceptedMediaType: {
             expected: string;
         };
+        PayloadTooLarge: {
+            /** Format: uint */
+            limit: number;
+        };
         ActionsQuery: {
             /** Format: uint64 */
             from: number;

package/dist/nord/api/actions.js

@@ -66,7 +66,7 @@ function createAction(currentTimestamp, nonce, kind) {
         kind,
     });
 }
-async function sendAction(serverUrl, makeSignedMessage, action, actionErrorDesc) {
+async function sendAction(serverUrl, makeSignedMessage, action) {
     const body = await prepareAction(action, makeSignedMessage);
     // NOTE: restructure and reuse client as it is in Nord.ts
     const client = (0, openapi_fetch_1.default)({ baseUrl: serverUrl });
@@ -77,14 +77,18 @@ async function sendAction(serverUrl, makeSignedMessage, action, actionErrorDesc)
             },
         },
         body: body,
+        // NOTE: openapi-fetch ignores headers and types/const headers in schema, and always assume all things are JSON
+        // to handle multi type bodies, need these overrides and later adhoc parsing
+        bodySerializer: (body) => body,
+        parseAs: "stream",
     });
     if (response.error) {
-        throw new Error(`Failed to ${actionErrorDesc}, HTTP status ${response}`);
+        throw new Error(`Failed to ${action.kind.case}, HTTP status ${JSON.stringify(response.error)}`);
     }
-    const rawResp = new Uint8Array(await response.response.arrayBuffer());
+    const rawResp = new Uint8Array(await response.response.bytes());
     const resp = (0, utils_1.decodeLengthDelimited)(rawResp, proto.ReceiptSchema);
     if (resp.kind?.case === "err") {
-        throw new Error(`Could not ${actionErrorDesc}, reason: ${proto.Error[resp.kind.value]}`);
+        throw new Error(`Could not execute ${action.kind.case}, reason: ${proto.Error[resp.kind.value]}`);
     }
     return resp;
 }
@@ -92,12 +96,17 @@ async function sendAction(serverUrl, makeSignedMessage, action, actionErrorDesc)
 // `makeSignedMessage` must include the original message and signature.
 async function prepareAction(action, makeSignedMessage) {
     const encoded = (0, wire_1.sizeDelimitedEncode)(proto.ActionSchema, action);
-    // NOTE(agent): keep in sync with MAX_HTTP_REQUEST_BODY_SIZE in rust code
-    const MAX_HTTP_REQUEST_BODY_SIZE = 1024;
-    if (encoded.byteLength > MAX_HTTP_REQUEST_BODY_SIZE) {
-        throw new Error(`Encoded message size (${encoded.byteLength} bytes) is greater than max payload size (${MAX_HTTP_REQUEST_BODY_SIZE} bytes).`);
+    // NOTE(agent): keep in sync with MAX_ENCODED_ACTION_SIZE in Rust code
+    const MAX_ENCODED_ACTION_SIZE = 1024;
+    if (encoded.byteLength > MAX_ENCODED_ACTION_SIZE) {
+        console.warn("Encoded message:", encoded);
+        throw new Error(`Encoded message size (${encoded.byteLength} bytes) is greater than max payload size (${MAX_ENCODED_ACTION_SIZE} bytes).`);
     }
     const body = await makeSignedMessage(encoded);
+    if (body.byteLength > MAX_ENCODED_ACTION_SIZE) {
+        console.warn("Encoded length:", encoded.byteLength);
+        throw new Error(`Signed message size (${body.byteLength} bytes) is greater than max payload size (${MAX_ENCODED_ACTION_SIZE} bytes).`);
+    }
     return body;
 }
 async function createSession(serverUrl, walletSignFn, currentTimestamp, nonce, params) {
@@ -119,7 +128,7 @@ async function createSession(serverUrl, walletSignFn, currentTimestamp, nonce, p
             expiryTimestamp: expiry,
         }),
     });
-    const resp = await sendAction(serverUrl, (m) => walletSign(walletSignFn, m), action, "create a new session");
+    const resp = await sendAction(serverUrl, (m) => walletSign(walletSignFn, m), action);
     if (resp.kind?.case === "createSessionResult") {
         return {
             actionId: resp.actionId,
@@ -137,7 +146,7 @@ async function revokeSession(serverUrl, walletSignFn, currentTimestamp, nonce, p
             sessionId: BigInt(params.sessionId),
         }),
     });
-    const resp = await sendAction(serverUrl, (m) => walletSign(walletSignFn, m), action, "revoke session");
+    const resp = await sendAction(serverUrl, (m) => walletSign(walletSignFn, m), action);
     return { actionId: resp.actionId };
 }
 async function withdraw(serverUrl, signFn, currentTimestamp, nonce, params) {
@@ -153,7 +162,7 @@ async function withdraw(serverUrl, signFn, currentTimestamp, nonce, params) {
             amount,
         }),
     });
-    const resp = await sendAction(serverUrl, (m) => sessionSign(signFn, m), action, "withdraw");
+    const resp = await sendAction(serverUrl, (m) => sessionSign(signFn, m), action);
     if (resp.kind?.case === "withdrawResult") {
         return { actionId: resp.actionId, ...resp.kind.value };
     }
@@ -191,7 +200,7 @@ async function placeOrder(serverUrl, signFn, currentTimestamp, nonce, params) {
             delegatorAccountId: params.liquidateeId,
         }),
     });
-    const resp = await sendAction(serverUrl, (m) => sessionSign(signFn, m), action, "place order");
+    const resp = await sendAction(serverUrl, (m) => sessionSign(signFn, m), action);
     if (resp.kind?.case === "placeOrderResult") {
         return {
             actionId: resp.actionId,
@@ -213,7 +222,7 @@ async function cancelOrder(serverUrl, signFn, currentTimestamp, nonce, params) {
             delegatorAccountId: params.liquidateeId,
         }),
     });
-    const resp = await sendAction(serverUrl, (m) => sessionSign(signFn, m), action, "cancel order");
+    const resp = await sendAction(serverUrl, (m) => sessionSign(signFn, m), action);
     if (resp.kind?.case === "cancelOrderResult") {
         return {
             actionId: resp.actionId,
@@ -236,7 +245,7 @@ async function transfer(serverUrl, signFn, currentTimestamp, nonce, params) {
             amount: (0, utils_1.toScaledU64)(params.amount ?? 0, params.tokenDecimals),
         }),
     });
-    const resp = await sendAction(serverUrl, (m) => sessionSign(signFn, m), action, "transfer");
+    const resp = await sendAction(serverUrl, (m) => sessionSign(signFn, m), action);
     if (resp.kind?.case === "transferred") {
         return {
             actionId: resp.actionId,
@@ -300,7 +309,7 @@ async function atomic(serverUrl, signFn, currentTimestamp, nonce, params) {
             actions: subactions,
         }),
     });
-    const resp = await sendAction(serverUrl, (m) => sessionSign(signFn, m), action, "execute atomic action");
+    const resp = await sendAction(serverUrl, (m) => sessionSign(signFn, m), action);
     if (resp.kind?.case === "atomic") {
         return {
             actionId: resp.actionId,

package/dist/utils.js

@@ -31,6 +31,7 @@ const bs58_1 = __importDefault(require("bs58"));
 exports.SESSION_TTL = 60n * 60n * 24n * 30n;
 exports.ZERO_DECIMAL = new decimal_js_1.Decimal(0);
 exports.MAX_BUFFER_LEN = 10000;
+// Max size of data returned from Nord endpoints
 const MAX_PAYLOAD_SIZE = 100 * 1024; // 100 kB
 function panic(message) {
     throw new Error(message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@n1xyz/nord-ts",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Typescript for Nord",
   "keywords": [],
   "author": "",

package/src/gen/openapi.ts

@@ -137,6 +137,14 @@ export interface paths {
                         "application/octet-stream": unknown;
                     };
                 };
+                413: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["PayloadTooLarge"];
+                    };
+                };
                 415: {
                     headers: {
                         /**
@@ -1911,6 +1919,10 @@ export interface components {
         AcceptedMediaType: {
             expected: string;
         };
+        PayloadTooLarge: {
+            /** Format: uint */
+            limit: number;
+        };
         ActionsQuery: {
             /** Format: uint64 */
             from: number;

package/src/nord/api/actions.ts

@@ -1,6 +1,6 @@
 import Decimal from "decimal.js";
 import * as proto from "../../gen/nord_pb";
-import { paths, components } from "../../gen/openapi";
+import { paths } from "../../gen/openapi";
 import createClient from "openapi-fetch";
 
 import { create } from "@bufbuild/protobuf";
@@ -14,7 +14,6 @@ import {
 import {
   assert,
   BigIntValue,
-  checkedFetch,
   checkPubKeyLength,
   decodeLengthDelimited,
   SESSION_TTL,
@@ -55,7 +54,6 @@ async function sendAction(
   serverUrl: string,
   makeSignedMessage: (message: Uint8Array) => Promise<Uint8Array>,
   action: proto.Action,
-  actionErrorDesc: string,
 ): Promise<proto.Receipt> {
   const body = await prepareAction(action, makeSignedMessage);
   // NOTE: restructure and reuse client as it is in Nord.ts
@@ -67,13 +65,19 @@ async function sendAction(
       },
     },
     body: body,
+    // NOTE: openapi-fetch ignores headers and types/const headers in schema, and always assume all things are JSON
+    // to handle multi type bodies, need these overrides and later adhoc parsing
+    bodySerializer: (body) => body,
+    parseAs: "stream",
   });
 
   if (response.error) {
-    throw new Error(`Failed to ${actionErrorDesc}, HTTP status ${response}`);
+    throw new Error(
+      `Failed to ${action.kind.case}, HTTP status ${JSON.stringify(response.error)}`,
+    );
   }
 
-  const rawResp = new Uint8Array(await response.response.arrayBuffer());
+  const rawResp = new Uint8Array(await response.response.bytes());
 
   const resp: proto.Receipt = decodeLengthDelimited(
     rawResp,
@@ -82,7 +86,7 @@ async function sendAction(
 
   if (resp.kind?.case === "err") {
     throw new Error(
-      `Could not ${actionErrorDesc}, reason: ${proto.Error[resp.kind.value]}`,
+      `Could not execute ${action.kind.case}, reason: ${proto.Error[resp.kind.value]}`,
     );
   }
 
@@ -96,14 +100,21 @@ export async function prepareAction(
   makeSignedMessage: (message: Uint8Array) => Promise<Uint8Array>,
 ) {
   const encoded = sizeDelimitedEncode(proto.ActionSchema, action);
-  // NOTE(agent): keep in sync with MAX_HTTP_REQUEST_BODY_SIZE in rust code
-  const MAX_HTTP_REQUEST_BODY_SIZE = 1024;
-  if (encoded.byteLength > MAX_HTTP_REQUEST_BODY_SIZE) {
+  // NOTE(agent): keep in sync with MAX_ENCODED_ACTION_SIZE in Rust code
+  const MAX_ENCODED_ACTION_SIZE = 1024;
+  if (encoded.byteLength > MAX_ENCODED_ACTION_SIZE) {
+    console.warn("Encoded message:", encoded);
     throw new Error(
-      `Encoded message size (${encoded.byteLength} bytes) is greater than max payload size (${MAX_HTTP_REQUEST_BODY_SIZE} bytes).`,
+      `Encoded message size (${encoded.byteLength} bytes) is greater than max payload size (${MAX_ENCODED_ACTION_SIZE} bytes).`,
     );
   }
   const body = await makeSignedMessage(encoded);
+  if (body.byteLength > MAX_ENCODED_ACTION_SIZE) {
+    console.warn("Encoded length:", encoded.byteLength);
+    throw new Error(
+      `Signed message size (${body.byteLength} bytes) is greater than max payload size (${MAX_ENCODED_ACTION_SIZE} bytes).`,
+    );
+  }
   return body;
 }
 
@@ -147,7 +158,6 @@ export async function createSession(
     serverUrl,
     (m) => walletSign(walletSignFn, m),
     action,
-    "create a new session",
   );
 
   if (resp.kind?.case === "createSessionResult") {
@@ -180,7 +190,6 @@ export async function revokeSession(
     serverUrl,
     (m) => walletSign(walletSignFn, m),
     action,
-    "revoke session",
   );
 
   return { actionId: resp.actionId };
@@ -217,7 +226,6 @@ export async function withdraw(
     serverUrl,
     (m) => sessionSign(signFn, m),
     action,
-    "withdraw",
   );
 
   if (resp.kind?.case === "withdrawResult") {
@@ -295,7 +303,6 @@ export async function placeOrder(
     serverUrl,
     (m) => sessionSign(signFn, m),
     action,
-    "place order",
   );
 
   if (resp.kind?.case === "placeOrderResult") {
@@ -339,7 +346,6 @@ export async function cancelOrder(
     serverUrl,
     (m) => sessionSign(signFn, m),
     action,
-    "cancel order",
   );
 
   if (resp.kind?.case === "cancelOrderResult") {
@@ -389,7 +395,6 @@ export async function transfer(
     serverUrl,
     (m) => sessionSign(signFn, m),
     action,
-    "transfer",
   );
 
   if (resp.kind?.case === "transferred") {
@@ -510,7 +515,6 @@ export async function atomic(
     serverUrl,
     (m) => sessionSign(signFn, m),
     action,
-    "execute atomic action",
   );
   if (resp.kind?.case === "atomic") {
     return {

package/src/utils.ts

@@ -17,6 +17,7 @@ export const SESSION_TTL: bigint = 60n * 60n * 24n * 30n;
 export const ZERO_DECIMAL = new Decimal(0);
 export const MAX_BUFFER_LEN = 10_000;
 
+// Max size of data returned from Nord endpoints
 const MAX_PAYLOAD_SIZE = 100 * 1024; // 100 kB
 
 /** Any type convertible to bigint */