@travetto/web-rpc 7.1.3 → 8.0.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/web-rpc",
-  "version": "7.1.3",
+  "version": "8.0.0-alpha.0",
   "type": "module",
   "description": "RPC support for a Web Application",
   "keywords": [
@@ -27,9 +27,9 @@
     "directory": "module/web-rpc"
   },
   "dependencies": {
-    "@travetto/config": "^7.1.3",
-    "@travetto/schema": "^7.1.3",
-    "@travetto/web": "^7.1.3"
+    "@travetto/config": "^8.0.0-alpha.0",
+    "@travetto/schema": "^8.0.0-alpha.0",
+    "@travetto/web": "^8.0.0-alpha.0"
   },
   "travetto": {
     "displayName": "Web RPC Support"

package/src/controller.ts

@@ -1,5 +1,5 @@
 import { Inject } from '@travetto/di';
-import { type Any, AppError, JSONUtil } from '@travetto/runtime';
+import { type Any, RuntimeError, JSONUtil } from '@travetto/runtime';
 import { IsPrivate } from '@travetto/schema';
 import {
   HeaderParam, Controller, ExcludeInterceptors, ControllerRegistryIndex,
@@ -36,7 +36,7 @@ export class WebRpcController {
     const endpoint = ControllerRegistryIndex.getEndpointConfigById(target);
 
     if (!endpoint || !endpoint.filter) {
-      throw new AppError('Unknown endpoint', { category: 'notfound' });
+      throw new RuntimeError('Unknown endpoint', { category: 'notfound' });
     }
 
     const { request } = this.ctx;
@@ -45,7 +45,7 @@ export class WebRpcController {
 
     // Allow request to read inputs from header
     if (paramInput) {
-      params = JSONUtil.parseBase64(paramInput)!;
+      params = JSONUtil.fromBase64(paramInput);
     } else if (Array.isArray(body)) { // Params passed via body
       params = body;
 
@@ -54,7 +54,7 @@ export class WebRpcController {
         request.body = params[bodyParamIdx];
       }
     } else if (body) {
-      throw new AppError('Invalid parameters, must be an array', { category: 'data' });
+      throw new RuntimeError('Invalid parameters, must be an array', { category: 'data' });
     } else {
       params = [];
     }

package/support/client/rpc-node.ts

@@ -2,11 +2,9 @@ import { consumeError } from './rpc.ts';
 
 export async function toNodeError(payload: unknown): Promise<Error> {
   try {
-    let result = undefined;
-    const { AppError } = await import('@travetto/runtime');
-    result = AppError.fromJSON(payload);
-    if (result) {
-      return result;
+    const { JSONUtil } = await import('@travetto/runtime');
+    if (JSONUtil.isJSONError(payload)) {
+      return JSONUtil.jsonErrorToError(payload);
     }
   } catch { }
   return consumeError(payload);

package/support/client/rpc.ts

@@ -17,6 +17,22 @@ const extendHeaders = (base: RequestInit['headers'], toAdd: Record<string, strin
   return headers;
 };
 
+const jsonToString = (input: unknown): string =>
+  JSON.stringify(input, (key, value): unknown => typeof value === 'bigint' ? `${value.toString()}n` : value);
+
+const stringToJson = <T = unknown>(input: string): T =>
+  JSON.parse(input, (key, value): unknown => {
+    if (typeof value === 'string') {
+      if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[.]\d{3}Z$/.test(value)) {
+        return new Date(value);
+      } else if (/^-?d+n$/.test(value)) {
+        return BigInt(value.slice(0, -1));
+      }
+    }
+    return value;
+  });
+
+
 export type PreRequestHandler = (item: RequestInit) => Promise<RequestInit | undefined | void>;
 export type PostResponseHandler = (item: Response) => Promise<Response | undefined | void>;
 
@@ -57,14 +73,14 @@ function isPlainObject(value: unknown): value is Record<string, unknown> {
     && Object.prototype.toString.call(value) === '[object Object]'; // separate build-in like Math
 }
 
-function registerTimeout<T extends (number | string | { unref(): unknown })>(
+function registerTimeout<T>(
   controller: AbortController,
   timeout: number,
   start: (fn: (...args: unknown[]) => unknown, delay: number) => T,
   stop: (value: T) => void
 ): void {
   const timer = start(() => controller.abort(), timeout);
-  if (!(typeof timer === 'number' || typeof timer === 'string')) {
+  if (timer && typeof timer === 'object' && 'unref' in timer && typeof timer.unref === 'function') {
     timer.unref();
   }
   controller.signal.onabort = (): void => { timer && stop(timer); };
@@ -85,14 +101,14 @@ export function getBody(inputs: unknown[], isBodyRequest: boolean): { body: Form
     return {
       body: undefined,
       headers: {
-        'X-TRV-RPC-INPUTS': btoa(encodeURIComponent(JSON.stringify(inputs)))
+        'X-TRV-RPC-INPUTS': btoa(encodeURIComponent(jsonToString(inputs)))
       }
     };
   }
   // If we do not have a blob, simple output
   if (!inputs.some(isBlobLike)) {
     return {
-      body: JSON.stringify(inputs),
+      body: jsonToString(inputs),
       headers: {
         'Content-Type': 'application/json'
       }
@@ -115,27 +131,24 @@ export function getBody(inputs: unknown[], isBodyRequest: boolean): { body: Form
   return {
     body: form,
     headers: {
-      'X-TRV-RPC-INPUTS': btoa(encodeURIComponent(JSON.stringify(plainInputs)))
+      'X-TRV-RPC-INPUTS': btoa(encodeURIComponent(jsonToString(plainInputs)))
     }
   };
 }
 
-export function consumeJSON<T>(text: string | unknown): T {
-  if (typeof text !== 'string') {
-    return consumeJSON(JSON.stringify(text));
-  } else if (text === null || text === undefined || text === '') {
+export function consumeJSON<T>(input: string | unknown): T {
+  let text: string;
+  if (input === null || input === undefined || input === '') {
     return undefined!;
+  } else if (typeof input !== 'string') {
+    text = jsonToString(input);
+  } else {
+    text = input;
   }
   try {
-    return JSON.parse(text, (key, value): unknown => {
-      if (typeof value === 'string' && /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[.]\d{3}Z/.test(value)) {
-        return new Date(value);
-      } else {
-        return value;
-      }
-    });
+    return stringToJson<T>(text);
   } catch (error) {
-    throw new Error(`Unable to parse response: ${text}, Unknown error: ${error}`);
+    throw new Error(`Unable to parse response: ${text}`, { cause: error });
   }
 }