@arrirpc/client 0.54.0 → 0.57.0

package/dist/index.cjs

@@ -1,5 +1,6 @@
 'use strict';
 
+const schema = require('@arrirpc/schema');
 const ofetch = require('ofetch');
 const eventSourcePlus = require('event-source-plus');
 const NodeWebsocket = require('ws');
@@ -79,7 +80,7 @@ async function getHeaders(input) {
     }
     return result;
   }
-  return input;
+  return input ?? {};
 }
 
 async function arriRequest(opts) {
@@ -90,11 +91,7 @@ async function arriRequest(opts) {
     case "get":
     case "head":
       if (opts.params && typeof opts.params === "object") {
-        const urlParts = [];
-        Object.keys(opts.params).forEach((key) => {
-          urlParts.push(`${key}=${opts.params[key]}`);
-        });
-        url = `${opts.url}?${urlParts.join("&")}`;
+        url = `${opts.url}?${opts.serializer(opts.params)}`;
       }
       break;
     default:
@@ -115,7 +112,7 @@ async function arriRequest(opts) {
       body,
       headers
     });
-    return opts.parser(result);
+    return opts.responseFromJson(result);
   } catch (err) {
     const error = err;
     if (isArriError(error.data)) {
@@ -165,6 +162,34 @@ async function arriSafeRequest(opts) {
     };
   }
 }
+const STR_ESCAPE = (
+  // eslint-disable-next-line no-control-regex
+  /[\u0000-\u001f\u0022\u005c\ud800-\udfff]|[\ud800-\udbff](?![\udc00-\udfff])|(?:[^\ud800-\udbff]|^)[\udc00-\udfff]/
+);
+function serializeString(input) {
+  if (input.length < 42) {
+    return schema.serializeSmallString(input);
+  }
+  if (input.length < 5e3 && !STR_ESCAPE.test(input)) {
+    return `"${input}"`;
+  }
+  return JSON.stringify(input);
+}
+const INT8_MIN = -128;
+const INT8_MAX = 127;
+const UINT8_MAX = 255;
+const INT16_MIN = -32768;
+const INT16_MAX = 32767;
+const UINT16_MAX = 65535;
+const INT32_MIN = -2147483648;
+const INT32_MAX = 2147483647;
+const UINT32_MAX = 4294967295;
+const INT64_MIN = BigInt("9223372036854775808");
+const INT64_MAX = BigInt("9223372036854775807");
+const UINT64_MAX = BigInt("18446744073709551615");
+function isObject(input) {
+  return typeof input === "object" && input !== null;
+}
 
 function arriSseRequest(opts, options) {
   let url = opts.url;
@@ -173,11 +198,7 @@ function arriSseRequest(opts, options) {
     case "get":
     case "head":
       if (opts.params && typeof opts.params === "object" && opts.params !== null) {
-        const urlParts = [];
-        Object.keys(opts.params).forEach((key) => {
-          urlParts.push(`${key}=${opts.params[key]}`);
-        });
-        url = `${opts.url}?${urlParts.join("&")}`;
+        url = `${opts.url}?${opts.serializer(opts.params)}`;
       }
       break;
     default:
@@ -202,7 +223,7 @@ function arriSseRequest(opts, options) {
   const controller = eventSource.listen({
     onMessage(message) {
       if (message.event === "message" || message.event === void 0 || message.event === "") {
-        options.onMessage?.(opts.parser(message.data));
+        options.onMessage?.(opts.responseFromString(message.data));
         return;
       }
       if (message.event === "done") {
@@ -319,7 +340,8 @@ async function arriWsRequest(opts, retryCount = 0) {
   try {
     const controller = new WsController({
       url,
-      parser: opts.parser,
+      responseFromJson: opts.responseFromJson,
+      responseFromString: opts.responseFromString,
       serializer: opts.serializer ?? ((_) => ""),
       onOpen: opts.onOpen,
       onClose: opts.onClose,
@@ -349,7 +371,7 @@ class WsController {
     __publicField(this, "onClose");
     this.url = opts.url;
     this._serializer = opts.serializer;
-    this._parser = opts.parser;
+    this._parser = opts.responseFromString;
     this.onOpen = opts.onOpen;
     this.onClose = opts.onClose;
     this.onErrorMessage = opts.onErrorMessage;
@@ -445,14 +467,29 @@ function parsedWsResponse(input) {
 }
 
 exports.ArriErrorInstance = ArriErrorInstance;
+exports.INT16_MAX = INT16_MAX;
+exports.INT16_MIN = INT16_MIN;
+exports.INT32_MAX = INT32_MAX;
+exports.INT32_MIN = INT32_MIN;
+exports.INT64_MAX = INT64_MAX;
+exports.INT64_MIN = INT64_MIN;
+exports.INT8_MAX = INT8_MAX;
+exports.INT8_MIN = INT8_MIN;
+exports.UINT16_MAX = UINT16_MAX;
+exports.UINT32_MAX = UINT32_MAX;
+exports.UINT64_MAX = UINT64_MAX;
+exports.UINT8_MAX = UINT8_MAX;
+exports.WsController = WsController;
 exports.arriRequest = arriRequest;
 exports.arriSafeRequest = arriSafeRequest;
 exports.arriSseRequest = arriSseRequest;
 exports.arriWsRequest = arriWsRequest;
 exports.isArriError = isArriError;
+exports.isObject = isObject;
 exports.parseSseEvent = parseSseEvent;
 exports.parseSseEvents = parseSseEvents;
 exports.parsedWsResponse = parsedWsResponse;
+exports.serializeString = serializeString;
 Object.keys(eventSourcePlus).forEach(function (k) {
     if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = eventSourcePlus[k];
 });

package/dist/index.d.cts

@@ -32,11 +32,12 @@ declare class ArriErrorInstance extends Error implements ArriError {
 interface ArriRequestOpts<TType, TParams extends Record<any, any> | undefined = undefined> {
     url: string;
     method: HttpMethod;
-    headers?: EventSourcePlusOptions["headers"];
+    headers: EventSourcePlusOptions["headers"];
     params?: TParams;
-    parser: (input: unknown) => TType;
+    responseFromJson: (input: Record<string, unknown>) => TType;
+    responseFromString: (input: string) => TType;
     serializer: (input: TParams) => TParams extends undefined ? undefined : string;
-    clientVersion?: string;
+    clientVersion: string;
 }
 declare function arriRequest<TType, TParams extends Record<any, any> | undefined = undefined>(opts: ArriRequestOpts<TType, TParams>): Promise<TType>;
 declare function arriSafeRequest<TType, TParams extends Record<any, any> | undefined = undefined>(opts: ArriRequestOpts<TType, TParams>): Promise<SafeResponse<TType>>;
@@ -47,6 +48,34 @@ type SafeResponse<T> = {
     success: false;
     error: ArriErrorInstance;
 };
+interface ArriModelValidator<T> {
+    new: () => T;
+    validate: (input: unknown) => input is T;
+    fromJson: (input: Record<string, unknown>) => T;
+    fromJsonString: (input: string) => T;
+    toJsonString: (input: T) => string;
+    toUrlQueryString: (input: T) => string;
+}
+interface ArriEnumValidator<T> {
+    new: () => T;
+    values: readonly T[];
+    validate: (input: unknown) => input is T;
+    fromSerialValue: (input: string) => T;
+}
+declare function serializeString(input: string): string;
+declare const INT8_MIN = -128;
+declare const INT8_MAX = 127;
+declare const UINT8_MAX = 255;
+declare const INT16_MIN = -32768;
+declare const INT16_MAX = 32767;
+declare const UINT16_MAX = 65535;
+declare const INT32_MIN = -2147483648;
+declare const INT32_MAX = 2147483647;
+declare const UINT32_MAX = 4294967295;
+declare const INT64_MIN: bigint;
+declare const INT64_MAX: bigint;
+declare const UINT64_MAX: bigint;
+declare function isObject(input: unknown): input is Record<string, unknown>;
 
 interface SseEvent<TData = string> {
     id?: string;
@@ -74,7 +103,8 @@ declare function parseSseEvents<TData = string>(input: string, dataParser: (inpu
 interface WsControllerOptions<TParams, TResponse> {
     url: string;
     serializer: (input: TParams) => string;
-    parser: (input: unknown) => TResponse;
+    responseFromJson: (input: Record<string, unknown>) => TResponse;
+    responseFromString: (input: string) => TResponse;
     onMessage?: WsMessageHook<TResponse>;
     onErrorMessage?: WsErrorHook;
     onConnectionError?: WsErrorHook;
@@ -92,7 +122,8 @@ interface ArriWsRequestOptions<TParams = any, TResponse = any> {
     url: string;
     headers?: EventSourcePlusOptions["headers"];
     params?: TParams;
-    parser: (input: unknown) => TResponse;
+    responseFromJson: (input: Record<string, unknown>) => TResponse;
+    responseFromString: (input: string) => TResponse;
     serializer: (input: TParams) => string;
     onMessage?: WsMessageHook<TResponse>;
     onError?: WsErrorHook;
@@ -126,4 +157,4 @@ declare function parsedWsResponse(input: string): {
     data: string;
 };
 
-export { type ArriError, ArriErrorInstance, type ArriRequestOpts, type SafeResponse, type SseEvent, type SseOptions, type WsOptions, arriRequest, arriSafeRequest, arriSseRequest, arriWsRequest, isArriError, parseSseEvent, parseSseEvents, parsedWsResponse };
+export { type ArriEnumValidator, type ArriError, ArriErrorInstance, type ArriModelValidator, type ArriRequestOpts, INT16_MAX, INT16_MIN, INT32_MAX, INT32_MIN, INT64_MAX, INT64_MIN, INT8_MAX, INT8_MIN, type SafeResponse, type SseEvent, type SseOptions, UINT16_MAX, UINT32_MAX, UINT64_MAX, UINT8_MAX, WsController, type WsOptions, arriRequest, arriSafeRequest, arriSseRequest, arriWsRequest, isArriError, isObject, parseSseEvent, parseSseEvents, parsedWsResponse, serializeString };

package/dist/index.d.mts

@@ -32,11 +32,12 @@ declare class ArriErrorInstance extends Error implements ArriError {
 interface ArriRequestOpts<TType, TParams extends Record<any, any> | undefined = undefined> {
     url: string;
     method: HttpMethod;
-    headers?: EventSourcePlusOptions["headers"];
+    headers: EventSourcePlusOptions["headers"];
     params?: TParams;
-    parser: (input: unknown) => TType;
+    responseFromJson: (input: Record<string, unknown>) => TType;
+    responseFromString: (input: string) => TType;
     serializer: (input: TParams) => TParams extends undefined ? undefined : string;
-    clientVersion?: string;
+    clientVersion: string;
 }
 declare function arriRequest<TType, TParams extends Record<any, any> | undefined = undefined>(opts: ArriRequestOpts<TType, TParams>): Promise<TType>;
 declare function arriSafeRequest<TType, TParams extends Record<any, any> | undefined = undefined>(opts: ArriRequestOpts<TType, TParams>): Promise<SafeResponse<TType>>;
@@ -47,6 +48,34 @@ type SafeResponse<T> = {
     success: false;
     error: ArriErrorInstance;
 };
+interface ArriModelValidator<T> {
+    new: () => T;
+    validate: (input: unknown) => input is T;
+    fromJson: (input: Record<string, unknown>) => T;
+    fromJsonString: (input: string) => T;
+    toJsonString: (input: T) => string;
+    toUrlQueryString: (input: T) => string;
+}
+interface ArriEnumValidator<T> {
+    new: () => T;
+    values: readonly T[];
+    validate: (input: unknown) => input is T;
+    fromSerialValue: (input: string) => T;
+}
+declare function serializeString(input: string): string;
+declare const INT8_MIN = -128;
+declare const INT8_MAX = 127;
+declare const UINT8_MAX = 255;
+declare const INT16_MIN = -32768;
+declare const INT16_MAX = 32767;
+declare const UINT16_MAX = 65535;
+declare const INT32_MIN = -2147483648;
+declare const INT32_MAX = 2147483647;
+declare const UINT32_MAX = 4294967295;
+declare const INT64_MIN: bigint;
+declare const INT64_MAX: bigint;
+declare const UINT64_MAX: bigint;
+declare function isObject(input: unknown): input is Record<string, unknown>;
 
 interface SseEvent<TData = string> {
     id?: string;
@@ -74,7 +103,8 @@ declare function parseSseEvents<TData = string>(input: string, dataParser: (inpu
 interface WsControllerOptions<TParams, TResponse> {
     url: string;
     serializer: (input: TParams) => string;
-    parser: (input: unknown) => TResponse;
+    responseFromJson: (input: Record<string, unknown>) => TResponse;
+    responseFromString: (input: string) => TResponse;
     onMessage?: WsMessageHook<TResponse>;
     onErrorMessage?: WsErrorHook;
     onConnectionError?: WsErrorHook;
@@ -92,7 +122,8 @@ interface ArriWsRequestOptions<TParams = any, TResponse = any> {
     url: string;
     headers?: EventSourcePlusOptions["headers"];
     params?: TParams;
-    parser: (input: unknown) => TResponse;
+    responseFromJson: (input: Record<string, unknown>) => TResponse;
+    responseFromString: (input: string) => TResponse;
     serializer: (input: TParams) => string;
     onMessage?: WsMessageHook<TResponse>;
     onError?: WsErrorHook;
@@ -126,4 +157,4 @@ declare function parsedWsResponse(input: string): {
     data: string;
 };
 
-export { type ArriError, ArriErrorInstance, type ArriRequestOpts, type SafeResponse, type SseEvent, type SseOptions, type WsOptions, arriRequest, arriSafeRequest, arriSseRequest, arriWsRequest, isArriError, parseSseEvent, parseSseEvents, parsedWsResponse };
+export { type ArriEnumValidator, type ArriError, ArriErrorInstance, type ArriModelValidator, type ArriRequestOpts, INT16_MAX, INT16_MIN, INT32_MAX, INT32_MIN, INT64_MAX, INT64_MIN, INT8_MAX, INT8_MIN, type SafeResponse, type SseEvent, type SseOptions, UINT16_MAX, UINT32_MAX, UINT64_MAX, UINT8_MAX, WsController, type WsOptions, arriRequest, arriSafeRequest, arriSseRequest, arriWsRequest, isArriError, isObject, parseSseEvent, parseSseEvents, parsedWsResponse, serializeString };

package/dist/index.d.ts

@@ -32,11 +32,12 @@ declare class ArriErrorInstance extends Error implements ArriError {
 interface ArriRequestOpts<TType, TParams extends Record<any, any> | undefined = undefined> {
     url: string;
     method: HttpMethod;
-    headers?: EventSourcePlusOptions["headers"];
+    headers: EventSourcePlusOptions["headers"];
     params?: TParams;
-    parser: (input: unknown) => TType;
+    responseFromJson: (input: Record<string, unknown>) => TType;
+    responseFromString: (input: string) => TType;
     serializer: (input: TParams) => TParams extends undefined ? undefined : string;
-    clientVersion?: string;
+    clientVersion: string;
 }
 declare function arriRequest<TType, TParams extends Record<any, any> | undefined = undefined>(opts: ArriRequestOpts<TType, TParams>): Promise<TType>;
 declare function arriSafeRequest<TType, TParams extends Record<any, any> | undefined = undefined>(opts: ArriRequestOpts<TType, TParams>): Promise<SafeResponse<TType>>;
@@ -47,6 +48,34 @@ type SafeResponse<T> = {
     success: false;
     error: ArriErrorInstance;
 };
+interface ArriModelValidator<T> {
+    new: () => T;
+    validate: (input: unknown) => input is T;
+    fromJson: (input: Record<string, unknown>) => T;
+    fromJsonString: (input: string) => T;
+    toJsonString: (input: T) => string;
+    toUrlQueryString: (input: T) => string;
+}
+interface ArriEnumValidator<T> {
+    new: () => T;
+    values: readonly T[];
+    validate: (input: unknown) => input is T;
+    fromSerialValue: (input: string) => T;
+}
+declare function serializeString(input: string): string;
+declare const INT8_MIN = -128;
+declare const INT8_MAX = 127;
+declare const UINT8_MAX = 255;
+declare const INT16_MIN = -32768;
+declare const INT16_MAX = 32767;
+declare const UINT16_MAX = 65535;
+declare const INT32_MIN = -2147483648;
+declare const INT32_MAX = 2147483647;
+declare const UINT32_MAX = 4294967295;
+declare const INT64_MIN: bigint;
+declare const INT64_MAX: bigint;
+declare const UINT64_MAX: bigint;
+declare function isObject(input: unknown): input is Record<string, unknown>;
 
 interface SseEvent<TData = string> {
     id?: string;
@@ -74,7 +103,8 @@ declare function parseSseEvents<TData = string>(input: string, dataParser: (inpu
 interface WsControllerOptions<TParams, TResponse> {
     url: string;
     serializer: (input: TParams) => string;
-    parser: (input: unknown) => TResponse;
+    responseFromJson: (input: Record<string, unknown>) => TResponse;
+    responseFromString: (input: string) => TResponse;
     onMessage?: WsMessageHook<TResponse>;
     onErrorMessage?: WsErrorHook;
     onConnectionError?: WsErrorHook;
@@ -92,7 +122,8 @@ interface ArriWsRequestOptions<TParams = any, TResponse = any> {
     url: string;
     headers?: EventSourcePlusOptions["headers"];
     params?: TParams;
-    parser: (input: unknown) => TResponse;
+    responseFromJson: (input: Record<string, unknown>) => TResponse;
+    responseFromString: (input: string) => TResponse;
     serializer: (input: TParams) => string;
     onMessage?: WsMessageHook<TResponse>;
     onError?: WsErrorHook;
@@ -126,4 +157,4 @@ declare function parsedWsResponse(input: string): {
     data: string;
 };
 
-export { type ArriError, ArriErrorInstance, type ArriRequestOpts, type SafeResponse, type SseEvent, type SseOptions, type WsOptions, arriRequest, arriSafeRequest, arriSseRequest, arriWsRequest, isArriError, parseSseEvent, parseSseEvents, parsedWsResponse };
+export { type ArriEnumValidator, type ArriError, ArriErrorInstance, type ArriModelValidator, type ArriRequestOpts, INT16_MAX, INT16_MIN, INT32_MAX, INT32_MIN, INT64_MAX, INT64_MIN, INT8_MAX, INT8_MIN, type SafeResponse, type SseEvent, type SseOptions, UINT16_MAX, UINT32_MAX, UINT64_MAX, UINT8_MAX, WsController, type WsOptions, arriRequest, arriSafeRequest, arriSseRequest, arriWsRequest, isArriError, isObject, parseSseEvent, parseSseEvents, parsedWsResponse, serializeString };

package/dist/index.mjs

@@ -1,3 +1,4 @@
+import { serializeSmallString } from '@arrirpc/schema';
 import { ofetch, FetchError } from 'ofetch';
 import { EventSourcePlus } from 'event-source-plus';
 export * from 'event-source-plus';
@@ -74,7 +75,7 @@ async function getHeaders(input) {
     }
     return result;
   }
-  return input;
+  return input ?? {};
 }
 
 async function arriRequest(opts) {
@@ -85,11 +86,7 @@ async function arriRequest(opts) {
     case "get":
     case "head":
       if (opts.params && typeof opts.params === "object") {
-        const urlParts = [];
-        Object.keys(opts.params).forEach((key) => {
-          urlParts.push(`${key}=${opts.params[key]}`);
-        });
-        url = `${opts.url}?${urlParts.join("&")}`;
+        url = `${opts.url}?${opts.serializer(opts.params)}`;
       }
       break;
     default:
@@ -110,7 +107,7 @@ async function arriRequest(opts) {
       body,
       headers
     });
-    return opts.parser(result);
+    return opts.responseFromJson(result);
   } catch (err) {
     const error = err;
     if (isArriError(error.data)) {
@@ -160,6 +157,34 @@ async function arriSafeRequest(opts) {
     };
   }
 }
+const STR_ESCAPE = (
+  // eslint-disable-next-line no-control-regex
+  /[\u0000-\u001f\u0022\u005c\ud800-\udfff]|[\ud800-\udbff](?![\udc00-\udfff])|(?:[^\ud800-\udbff]|^)[\udc00-\udfff]/
+);
+function serializeString(input) {
+  if (input.length < 42) {
+    return serializeSmallString(input);
+  }
+  if (input.length < 5e3 && !STR_ESCAPE.test(input)) {
+    return `"${input}"`;
+  }
+  return JSON.stringify(input);
+}
+const INT8_MIN = -128;
+const INT8_MAX = 127;
+const UINT8_MAX = 255;
+const INT16_MIN = -32768;
+const INT16_MAX = 32767;
+const UINT16_MAX = 65535;
+const INT32_MIN = -2147483648;
+const INT32_MAX = 2147483647;
+const UINT32_MAX = 4294967295;
+const INT64_MIN = BigInt("9223372036854775808");
+const INT64_MAX = BigInt("9223372036854775807");
+const UINT64_MAX = BigInt("18446744073709551615");
+function isObject(input) {
+  return typeof input === "object" && input !== null;
+}
 
 function arriSseRequest(opts, options) {
   let url = opts.url;
@@ -168,11 +193,7 @@ function arriSseRequest(opts, options) {
     case "get":
     case "head":
       if (opts.params && typeof opts.params === "object" && opts.params !== null) {
-        const urlParts = [];
-        Object.keys(opts.params).forEach((key) => {
-          urlParts.push(`${key}=${opts.params[key]}`);
-        });
-        url = `${opts.url}?${urlParts.join("&")}`;
+        url = `${opts.url}?${opts.serializer(opts.params)}`;
       }
       break;
     default:
@@ -197,7 +218,7 @@ function arriSseRequest(opts, options) {
   const controller = eventSource.listen({
     onMessage(message) {
       if (message.event === "message" || message.event === void 0 || message.event === "") {
-        options.onMessage?.(opts.parser(message.data));
+        options.onMessage?.(opts.responseFromString(message.data));
         return;
       }
       if (message.event === "done") {
@@ -314,7 +335,8 @@ async function arriWsRequest(opts, retryCount = 0) {
   try {
     const controller = new WsController({
       url,
-      parser: opts.parser,
+      responseFromJson: opts.responseFromJson,
+      responseFromString: opts.responseFromString,
       serializer: opts.serializer ?? ((_) => ""),
       onOpen: opts.onOpen,
       onClose: opts.onClose,
@@ -344,7 +366,7 @@ class WsController {
     __publicField(this, "onClose");
     this.url = opts.url;
     this._serializer = opts.serializer;
-    this._parser = opts.parser;
+    this._parser = opts.responseFromString;
     this.onOpen = opts.onOpen;
     this.onClose = opts.onClose;
     this.onErrorMessage = opts.onErrorMessage;
@@ -439,4 +461,4 @@ function parsedWsResponse(input) {
   };
 }
 
-export { ArriErrorInstance, arriRequest, arriSafeRequest, arriSseRequest, arriWsRequest, isArriError, parseSseEvent, parseSseEvents, parsedWsResponse };
+export { ArriErrorInstance, INT16_MAX, INT16_MIN, INT32_MAX, INT32_MIN, INT64_MAX, INT64_MIN, INT8_MAX, INT8_MIN, UINT16_MAX, UINT32_MAX, UINT64_MAX, UINT8_MAX, WsController, arriRequest, arriSafeRequest, arriSseRequest, arriWsRequest, isArriError, isObject, parseSseEvent, parseSseEvents, parsedWsResponse, serializeString };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arrirpc/client",
-  "version": "0.54.0",
+  "version": "0.57.0",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -22,12 +22,12 @@
     "directory": "languages/ts/ts-client"
   },
   "dependencies": {
-    "event-source-plus": "^0.1.1",
+    "event-source-plus": "^0.1.2",
     "ofetch": "^1.3.4",
-    "ws": "^8.17.1",
-    "@arrirpc/schema": "0.54.0"
+    "ws": "^8.18.0",
+    "@arrirpc/schema": "0.57.0"
   },
   "devDependencies": {
-    "@types/ws": "^8.5.10"
+    "@types/ws": "^8.5.11"
   }
 }