@arrirpc/client 0.80.1 → 0.80.2

package/dist/index.cjs

@@ -3,11 +3,6 @@
 const schema = require('@arrirpc/schema');
 const ofetch = require('ofetch');
 const eventSourcePlus = require('event-source-plus');
-const NodeWebsocket = require('ws');
-
-function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
-
-const NodeWebsocket__default = /*#__PURE__*/_interopDefaultCompat(NodeWebsocket);
 
 function isArriError(input) {
   if (typeof input !== "object" || input === null) {
@@ -293,157 +288,6 @@ function arriSseRequest(opts, options) {
   return controller;
 }
 
-function isBrowser() {
-  return typeof window !== "undefined";
-}
-function connectWebsocket(url, protocol) {
-  if (isBrowser()) {
-    return new WebSocket(url, protocol);
-  }
-  return new NodeWebsocket__default(url, {
-    protocol
-  });
-}
-async function arriWsRequest(opts, retryCount = 0) {
-  let url = opts.url.replace("http://", "ws://").replace("https://", "wss://");
-  const headers = await getHeaders(opts.headers);
-  if (headers) {
-    if (opts.clientVersion) headers["client-version"] = opts.clientVersion;
-    const queryParts = [];
-    for (const key of Object.keys(headers)) {
-      queryParts.push(`${key}=${headers[key]}`);
-    }
-    url += `?${queryParts.join("&")}`;
-  }
-  try {
-    const controller = new WsController({
-      url,
-      responseFromJson: opts.responseFromJson,
-      responseFromString: opts.responseFromString,
-      serializer: opts.serializer ?? ((_) => ""),
-      onOpen: opts.onOpen,
-      onClose: opts.onClose,
-      onMessage: opts.onMessage,
-      onErrorMessage: opts.onError,
-      onConnectionError: opts.onConnectionError
-    });
-    return controller;
-  } catch (err) {
-    console.error(err);
-    if (opts.onConnectionError) {
-      opts.onConnectionError(err);
-    }
-    return arriWsRequest(opts, retryCount + 1);
-  }
-}
-class WsController {
-  url;
-  _ws;
-  _serializer;
-  _parser;
-  onMessage;
-  onErrorMessage;
-  onConnectionError;
-  onOpen;
-  onClose;
-  constructor(opts) {
-    this.url = opts.url;
-    this._serializer = opts.serializer;
-    this._parser = opts.responseFromString;
-    this.onOpen = opts.onOpen;
-    this.onClose = opts.onClose;
-    this.onErrorMessage = opts.onErrorMessage;
-    this.onConnectionError = opts.onConnectionError;
-    this.onMessage = opts.onMessage;
-  }
-  connect() {
-    this._ws = connectWebsocket(this.url);
-    this._ws.onopen = () => {
-      this.onOpen?.();
-    };
-    this._ws.onclose = () => {
-      this.onClose?.();
-    };
-    this._ws.onmessage = (event) => {
-      this._handleMessage(event);
-    };
-    this._ws.onerror = (event) => {
-      this.onConnectionError?.(
-        new ArriErrorInstance({
-          code: "errno" in event.error && typeof event.error.errno === "number" ? event.error.errno : 0,
-          message: event.error instanceof Error ? event.error.message : `Error connecting to ${this.url}`,
-          data: event.error,
-          stack: event.error instanceof Error ? event.error.stack : void 0
-        })
-      );
-    };
-  }
-  readyState() {
-    return this._ws?.readyState ?? -1;
-  }
-  send(message) {
-    const payload = this._serializer(message);
-    this._ws?.send(payload);
-  }
-  close() {
-    this._ws?.close();
-  }
-  _handleMessage(msg) {
-    if (typeof msg.data !== "string") {
-      return;
-    }
-    const response = parsedWsResponse(msg.data);
-    switch (response.event) {
-      case "error": {
-        if (!this.onErrorMessage) {
-          return;
-        }
-        const err = ArriErrorInstance.fromJson(response.data);
-        this.onErrorMessage(err);
-        break;
-      }
-      case "message": {
-        if (!this.onMessage) {
-          return;
-        }
-        const msg2 = this._parser(response.data);
-        this.onMessage(msg2);
-        break;
-      }
-      default:
-        console.warn("Invalid response from server", msg);
-        break;
-    }
-  }
-}
-function parsedWsResponse(input) {
-  const lines = input.split("\n");
-  let event = "unknown";
-  let data = "";
-  for (const line of lines) {
-    const trimmedLine = line.trim();
-    if (trimmedLine.startsWith("event: ")) {
-      switch (trimmedLine.substring(6).trim()) {
-        case "error":
-          event = "error";
-          break;
-        case "message":
-          event = "message";
-          break;
-      }
-      continue;
-    }
-    if (trimmedLine.startsWith("data: ")) {
-      data = trimmedLine.substring(5).trim();
-      continue;
-    }
-  }
-  return {
-    event,
-    data
-  };
-}
-
 exports.createFetch = ofetch.createFetch;
 exports.ofetch = ofetch.ofetch;
 exports.ArriErrorInstance = ArriErrorInstance;
@@ -459,14 +303,11 @@ 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.parsedWsResponse = parsedWsResponse;
 exports.serializeString = serializeString;
 Object.prototype.hasOwnProperty.call(eventSourcePlus, '__proto__') &&
     !Object.prototype.hasOwnProperty.call(exports, '__proto__') &&

package/dist/index.d.cts

@@ -129,62 +129,5 @@ interface SseOptions<TData> {
 }
 declare function arriSseRequest<TType, TParams extends Record<any, any> | undefined = undefined>(opts: ArriRequestConfig<TType, TParams>, options: SseOptions<TType>): EventSourceController;
 
-interface WsControllerOptions<TParams, TResponse> {
-    url: string;
-    serializer: (input: TParams) => string;
-    responseFromJson: (input: Record<string, unknown>) => TResponse;
-    responseFromString: (input: string) => TResponse;
-    onMessage?: WsMessageHook<TResponse>;
-    onErrorMessage?: WsErrorHook;
-    onConnectionError?: WsErrorHook;
-    onOpen?: () => any;
-    onClose?: () => any;
-}
-interface WsOptions<TResponse> {
-    onMessage?: WsMessageHook<TResponse>;
-    onError?: WsErrorHook;
-    onConnectionError?: WsErrorHook;
-    onOpen?: () => any;
-    onClose?: () => any;
-}
-interface ArriWsRequestOptions<TParams = any, TResponse = any> {
-    url: string;
-    headers?: EventSourcePlusOptions['headers'];
-    params?: TParams;
-    responseFromJson: (input: Record<string, unknown>) => TResponse;
-    responseFromString: (input: string) => TResponse;
-    serializer: (input: TParams) => string;
-    onMessage?: WsMessageHook<TResponse>;
-    onError?: WsErrorHook;
-    onConnectionError?: WsErrorHook;
-    onOpen?: () => any;
-    onClose?: () => any;
-    clientVersion?: string;
-}
-declare function arriWsRequest<TParams extends Record<any, any> | undefined = undefined, TResponse = any>(opts: ArriWsRequestOptions<TParams, TResponse>, retryCount?: number): Promise<WsController<TParams, TResponse>>;
-type WsErrorHook = (err: ArriErrorInstance) => void;
-type WsMessageHook<TResponse> = (msg: TResponse) => any;
-declare class WsController<TParams, TResponse> {
-    url: string;
-    private _ws?;
-    private readonly _serializer;
-    private readonly _parser;
-    onMessage?: WsMessageHook<TResponse>;
-    onErrorMessage?: WsErrorHook;
-    onConnectionError?: WsErrorHook;
-    onOpen?: () => any;
-    onClose?: () => any;
-    constructor(opts: WsControllerOptions<TParams, TResponse>);
-    connect(): void;
-    readyState(): number;
-    send(message: TParams): void;
-    close(): void;
-    private _handleMessage;
-}
-declare function parsedWsResponse(input: string): {
-    event: 'message' | 'error' | 'unknown';
-    data: string;
-};
-
-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, parsedWsResponse, serializeString };
-export type { ArriEnumValidator, ArriError, ArriModelValidator, ArriRequestConfig, ArriRequestOptions, SafeResponse, SseEvent, SseOptions, WsOptions };
+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, arriRequest, arriSafeRequest, arriSseRequest, isArriError, isObject, serializeString };
+export type { ArriEnumValidator, ArriError, ArriModelValidator, ArriRequestConfig, ArriRequestOptions, SafeResponse, SseEvent, SseOptions };

package/dist/index.d.mts

@@ -129,62 +129,5 @@ interface SseOptions<TData> {
 }
 declare function arriSseRequest<TType, TParams extends Record<any, any> | undefined = undefined>(opts: ArriRequestConfig<TType, TParams>, options: SseOptions<TType>): EventSourceController;
 
-interface WsControllerOptions<TParams, TResponse> {
-    url: string;
-    serializer: (input: TParams) => string;
-    responseFromJson: (input: Record<string, unknown>) => TResponse;
-    responseFromString: (input: string) => TResponse;
-    onMessage?: WsMessageHook<TResponse>;
-    onErrorMessage?: WsErrorHook;
-    onConnectionError?: WsErrorHook;
-    onOpen?: () => any;
-    onClose?: () => any;
-}
-interface WsOptions<TResponse> {
-    onMessage?: WsMessageHook<TResponse>;
-    onError?: WsErrorHook;
-    onConnectionError?: WsErrorHook;
-    onOpen?: () => any;
-    onClose?: () => any;
-}
-interface ArriWsRequestOptions<TParams = any, TResponse = any> {
-    url: string;
-    headers?: EventSourcePlusOptions['headers'];
-    params?: TParams;
-    responseFromJson: (input: Record<string, unknown>) => TResponse;
-    responseFromString: (input: string) => TResponse;
-    serializer: (input: TParams) => string;
-    onMessage?: WsMessageHook<TResponse>;
-    onError?: WsErrorHook;
-    onConnectionError?: WsErrorHook;
-    onOpen?: () => any;
-    onClose?: () => any;
-    clientVersion?: string;
-}
-declare function arriWsRequest<TParams extends Record<any, any> | undefined = undefined, TResponse = any>(opts: ArriWsRequestOptions<TParams, TResponse>, retryCount?: number): Promise<WsController<TParams, TResponse>>;
-type WsErrorHook = (err: ArriErrorInstance) => void;
-type WsMessageHook<TResponse> = (msg: TResponse) => any;
-declare class WsController<TParams, TResponse> {
-    url: string;
-    private _ws?;
-    private readonly _serializer;
-    private readonly _parser;
-    onMessage?: WsMessageHook<TResponse>;
-    onErrorMessage?: WsErrorHook;
-    onConnectionError?: WsErrorHook;
-    onOpen?: () => any;
-    onClose?: () => any;
-    constructor(opts: WsControllerOptions<TParams, TResponse>);
-    connect(): void;
-    readyState(): number;
-    send(message: TParams): void;
-    close(): void;
-    private _handleMessage;
-}
-declare function parsedWsResponse(input: string): {
-    event: 'message' | 'error' | 'unknown';
-    data: string;
-};
-
-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, parsedWsResponse, serializeString };
-export type { ArriEnumValidator, ArriError, ArriModelValidator, ArriRequestConfig, ArriRequestOptions, SafeResponse, SseEvent, SseOptions, WsOptions };
+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, arriRequest, arriSafeRequest, arriSseRequest, isArriError, isObject, serializeString };
+export type { ArriEnumValidator, ArriError, ArriModelValidator, ArriRequestConfig, ArriRequestOptions, SafeResponse, SseEvent, SseOptions };

package/dist/index.d.ts

@@ -129,62 +129,5 @@ interface SseOptions<TData> {
 }
 declare function arriSseRequest<TType, TParams extends Record<any, any> | undefined = undefined>(opts: ArriRequestConfig<TType, TParams>, options: SseOptions<TType>): EventSourceController;
 
-interface WsControllerOptions<TParams, TResponse> {
-    url: string;
-    serializer: (input: TParams) => string;
-    responseFromJson: (input: Record<string, unknown>) => TResponse;
-    responseFromString: (input: string) => TResponse;
-    onMessage?: WsMessageHook<TResponse>;
-    onErrorMessage?: WsErrorHook;
-    onConnectionError?: WsErrorHook;
-    onOpen?: () => any;
-    onClose?: () => any;
-}
-interface WsOptions<TResponse> {
-    onMessage?: WsMessageHook<TResponse>;
-    onError?: WsErrorHook;
-    onConnectionError?: WsErrorHook;
-    onOpen?: () => any;
-    onClose?: () => any;
-}
-interface ArriWsRequestOptions<TParams = any, TResponse = any> {
-    url: string;
-    headers?: EventSourcePlusOptions['headers'];
-    params?: TParams;
-    responseFromJson: (input: Record<string, unknown>) => TResponse;
-    responseFromString: (input: string) => TResponse;
-    serializer: (input: TParams) => string;
-    onMessage?: WsMessageHook<TResponse>;
-    onError?: WsErrorHook;
-    onConnectionError?: WsErrorHook;
-    onOpen?: () => any;
-    onClose?: () => any;
-    clientVersion?: string;
-}
-declare function arriWsRequest<TParams extends Record<any, any> | undefined = undefined, TResponse = any>(opts: ArriWsRequestOptions<TParams, TResponse>, retryCount?: number): Promise<WsController<TParams, TResponse>>;
-type WsErrorHook = (err: ArriErrorInstance) => void;
-type WsMessageHook<TResponse> = (msg: TResponse) => any;
-declare class WsController<TParams, TResponse> {
-    url: string;
-    private _ws?;
-    private readonly _serializer;
-    private readonly _parser;
-    onMessage?: WsMessageHook<TResponse>;
-    onErrorMessage?: WsErrorHook;
-    onConnectionError?: WsErrorHook;
-    onOpen?: () => any;
-    onClose?: () => any;
-    constructor(opts: WsControllerOptions<TParams, TResponse>);
-    connect(): void;
-    readyState(): number;
-    send(message: TParams): void;
-    close(): void;
-    private _handleMessage;
-}
-declare function parsedWsResponse(input: string): {
-    event: 'message' | 'error' | 'unknown';
-    data: string;
-};
-
-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, parsedWsResponse, serializeString };
-export type { ArriEnumValidator, ArriError, ArriModelValidator, ArriRequestConfig, ArriRequestOptions, SafeResponse, SseEvent, SseOptions, WsOptions };
+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, arriRequest, arriSafeRequest, arriSseRequest, isArriError, isObject, serializeString };
+export type { ArriEnumValidator, ArriError, ArriModelValidator, ArriRequestConfig, ArriRequestOptions, SafeResponse, SseEvent, SseOptions };

package/dist/index.mjs

@@ -3,7 +3,6 @@ import { ofetch, FetchError } from 'ofetch';
 export { createFetch, ofetch } from 'ofetch';
 import { EventSourcePlus } from 'event-source-plus';
 export * from 'event-source-plus';
-import NodeWebsocket from 'ws';
 
 function isArriError(input) {
   if (typeof input !== "object" || input === null) {
@@ -289,155 +288,4 @@ function arriSseRequest(opts, options) {
   return controller;
 }
 
-function isBrowser() {
-  return typeof window !== "undefined";
-}
-function connectWebsocket(url, protocol) {
-  if (isBrowser()) {
-    return new WebSocket(url, protocol);
-  }
-  return new NodeWebsocket(url, {
-    protocol
-  });
-}
-async function arriWsRequest(opts, retryCount = 0) {
-  let url = opts.url.replace("http://", "ws://").replace("https://", "wss://");
-  const headers = await getHeaders(opts.headers);
-  if (headers) {
-    if (opts.clientVersion) headers["client-version"] = opts.clientVersion;
-    const queryParts = [];
-    for (const key of Object.keys(headers)) {
-      queryParts.push(`${key}=${headers[key]}`);
-    }
-    url += `?${queryParts.join("&")}`;
-  }
-  try {
-    const controller = new WsController({
-      url,
-      responseFromJson: opts.responseFromJson,
-      responseFromString: opts.responseFromString,
-      serializer: opts.serializer ?? ((_) => ""),
-      onOpen: opts.onOpen,
-      onClose: opts.onClose,
-      onMessage: opts.onMessage,
-      onErrorMessage: opts.onError,
-      onConnectionError: opts.onConnectionError
-    });
-    return controller;
-  } catch (err) {
-    console.error(err);
-    if (opts.onConnectionError) {
-      opts.onConnectionError(err);
-    }
-    return arriWsRequest(opts, retryCount + 1);
-  }
-}
-class WsController {
-  url;
-  _ws;
-  _serializer;
-  _parser;
-  onMessage;
-  onErrorMessage;
-  onConnectionError;
-  onOpen;
-  onClose;
-  constructor(opts) {
-    this.url = opts.url;
-    this._serializer = opts.serializer;
-    this._parser = opts.responseFromString;
-    this.onOpen = opts.onOpen;
-    this.onClose = opts.onClose;
-    this.onErrorMessage = opts.onErrorMessage;
-    this.onConnectionError = opts.onConnectionError;
-    this.onMessage = opts.onMessage;
-  }
-  connect() {
-    this._ws = connectWebsocket(this.url);
-    this._ws.onopen = () => {
-      this.onOpen?.();
-    };
-    this._ws.onclose = () => {
-      this.onClose?.();
-    };
-    this._ws.onmessage = (event) => {
-      this._handleMessage(event);
-    };
-    this._ws.onerror = (event) => {
-      this.onConnectionError?.(
-        new ArriErrorInstance({
-          code: "errno" in event.error && typeof event.error.errno === "number" ? event.error.errno : 0,
-          message: event.error instanceof Error ? event.error.message : `Error connecting to ${this.url}`,
-          data: event.error,
-          stack: event.error instanceof Error ? event.error.stack : void 0
-        })
-      );
-    };
-  }
-  readyState() {
-    return this._ws?.readyState ?? -1;
-  }
-  send(message) {
-    const payload = this._serializer(message);
-    this._ws?.send(payload);
-  }
-  close() {
-    this._ws?.close();
-  }
-  _handleMessage(msg) {
-    if (typeof msg.data !== "string") {
-      return;
-    }
-    const response = parsedWsResponse(msg.data);
-    switch (response.event) {
-      case "error": {
-        if (!this.onErrorMessage) {
-          return;
-        }
-        const err = ArriErrorInstance.fromJson(response.data);
-        this.onErrorMessage(err);
-        break;
-      }
-      case "message": {
-        if (!this.onMessage) {
-          return;
-        }
-        const msg2 = this._parser(response.data);
-        this.onMessage(msg2);
-        break;
-      }
-      default:
-        console.warn("Invalid response from server", msg);
-        break;
-    }
-  }
-}
-function parsedWsResponse(input) {
-  const lines = input.split("\n");
-  let event = "unknown";
-  let data = "";
-  for (const line of lines) {
-    const trimmedLine = line.trim();
-    if (trimmedLine.startsWith("event: ")) {
-      switch (trimmedLine.substring(6).trim()) {
-        case "error":
-          event = "error";
-          break;
-        case "message":
-          event = "message";
-          break;
-      }
-      continue;
-    }
-    if (trimmedLine.startsWith("data: ")) {
-      data = trimmedLine.substring(5).trim();
-      continue;
-    }
-  }
-  return {
-    event,
-    data
-  };
-}
-
-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, parsedWsResponse, serializeString };
+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, arriRequest, arriSafeRequest, arriSseRequest, isArriError, isObject, serializeString };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arrirpc/client",
-  "version": "0.80.1",
+  "version": "0.80.2",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -25,7 +25,7 @@
     "event-source-plus": "^0.1.11",
     "ofetch": "^1.4.1",
     "ws": "^8.18.2",
-    "@arrirpc/schema": "0.80.1"
+    "@arrirpc/schema": "0.80.2"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1"