fix(virtualstream): Expose transport localData to handlers via TypedTools; improve VirtualStream payload encode/decode to preserve built-ins and handle nested arrays/objects
This commit is contained in:
@@ -3,6 +3,6 @@
|
||||
*/
|
||||
export const commitinfo = {
|
||||
name: '@api.global/typedrequest',
|
||||
version: '3.1.10',
|
||||
version: '3.1.11',
|
||||
description: 'A TypeScript library for making typed requests towards APIs, including facilities for handling requests, routing, and virtual stream handling.'
|
||||
}
|
||||
|
||||
@@ -31,6 +31,10 @@ export class TypedHandler<T extends plugins.typedRequestInterfaces.ITypedRequest
|
||||
}
|
||||
let typedResponseError: TypedResponseError;
|
||||
const typedtoolsInstance = new TypedTools();
|
||||
// Pass localData from the request to TypedTools so handlers can access transport-layer context
|
||||
if (typedRequestArg.localData) {
|
||||
typedtoolsInstance.localData = typedRequestArg.localData;
|
||||
}
|
||||
const response = await this.handlerFunction(typedRequestArg.request, typedtoolsInstance).catch((e) => {
|
||||
if (e instanceof TypedResponseError) {
|
||||
typedResponseError = e;
|
||||
|
||||
@@ -2,6 +2,12 @@ import { TypedResponseError } from './classes.typedresponseerror.js';
|
||||
import * as plugins from './plugins.js';
|
||||
|
||||
export class TypedTools {
|
||||
/**
|
||||
* Local data passed from the transport layer.
|
||||
* This can contain connection-specific context like the WebSocket peer.
|
||||
*/
|
||||
public localData: Record<string, any> = {};
|
||||
|
||||
public async passGuards<T = any>(guardsArg: plugins.smartguard.Guard<T>[], dataArg: T) {
|
||||
const guardSet = new plugins.smartguard.GuardSet<T>(guardsArg);
|
||||
const guardResult = await guardSet.allGuardsPass(dataArg);
|
||||
|
||||
@@ -82,7 +82,7 @@ export class VirtualStream<T = Uint8Array> implements plugins.typedRequestInterf
|
||||
}
|
||||
|
||||
public static decodePayloadFromNetwork(objectPayload: any, commFunctions: ICommFunctions): any {
|
||||
|
||||
|
||||
if (
|
||||
plugins.smartbuffer.isBufferLike(objectPayload)
|
||||
|| objectPayload instanceof TypedRouter
|
||||
@@ -90,6 +90,18 @@ export class VirtualStream<T = Uint8Array> implements plugins.typedRequestInterf
|
||||
return objectPayload;
|
||||
}
|
||||
if (objectPayload !== null && typeof objectPayload === 'object') {
|
||||
// Preserve built-in objects that shouldn't be transformed
|
||||
if (
|
||||
objectPayload instanceof Set ||
|
||||
objectPayload instanceof Map ||
|
||||
objectPayload instanceof Date ||
|
||||
objectPayload instanceof RegExp ||
|
||||
objectPayload instanceof Error ||
|
||||
objectPayload instanceof Promise ||
|
||||
typeof objectPayload.then === 'function'
|
||||
) {
|
||||
return objectPayload;
|
||||
}
|
||||
if (objectPayload._isVirtualStream) {
|
||||
const virtualStream = new VirtualStream();
|
||||
virtualStream.streamId = objectPayload.streamId;
|
||||
|
||||
Reference in New Issue
Block a user