npm - @peerbit/rpc - Versions diffs - 6.0.35 → 6.1.1 - Mend

@peerbit/rpc 6.0.35 → 6.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/dist/src/controller.d.ts +14 -0
package/dist/src/controller.d.ts.map +1 -1
package/dist/src/controller.js +73 -7
package/dist/src/controller.js.map +1 -1
package/package.json +7 -7
package/src/controller.ts +107 -9

package/dist/src/controller.d.ts CHANGED Viewed

@@ -8,6 +8,13 @@ export type RPCSetupOptions<Q, R> = {
     queryType: AbstractType<Q>;
     responseType: AbstractType<R>;
     responseHandler?: ResponseHandler<Q, R>;
+    /**
+     * Opt-in fast path: resolve the request object for an inbound message
+     * without decoding `RequestV0.request` (e.g. from a native wire stash
+     * keyed by the message id). Returning undefined falls back to the normal
+     * decrypt + deserialize path, so semantics never diverge.
+     */
+    resolveRequest?: (message: DataMessage) => Q | undefined;
 };
 export type RequestContext = {
     from?: PublicSignKey;
@@ -25,13 +32,20 @@ export type RequestEvent<R> = {
     message: DataMessage;
     from?: PublicSignKey;
 };
+export type CodecErrorEvent = {
+    error: Error;
+    stage: "decode-request" | "handle-request" | "encode-response" | "publish-response" | "dispatch-response" | "decode-response";
+    message: DataMessage;
+};
 export interface RPCEvents<Q, R> extends ProgramEvents {
     request: CustomEvent<RequestEvent<Q>>;
     response: CustomEvent<ResponseEvent<R>>;
+    codecError: CustomEvent<CodecErrorEvent>;
 }
 export declare class RPC<Q, R> extends Program<RPCSetupOptions<Q, R>, RPCEvents<Q, R>> {
     private _subscribed;
     private _responseHandler?;
+    private _resolveRequest?;
     private _responseResolver;
     private _requestType;
     private _requestTypeIsUint8Array;

package/dist/src/controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,YAAY,EAKjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAIN,aAAa,EAKb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAK/D,OAAO,EAEN,WAAW,EAEX,KAAK,uBAAuB,EAG5B,MAAM,2BAA2B,CAAC;AAInC,OAAO,EAEN,KAAK,iBAAiB,EACtB,KAAK,WAAW,EAChB,KAAK,cAAc,EAEnB,MAAM,SAAS,CAAC;AAEjB,MAAM,MAAM,eAAe,CAAC,CAAC,EAAE,CAAC,IAAI;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;IAC9B,eAAe,CAAC,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;~~CACxC~~,CAAC;AACF,MAAM,MAAM,cAAc,GAAG;IAC5B,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB,OAAO,EAAE,WAAW,CAAC;IACrB,SAAS,EAAE,uBAAuB,CAAC;CACnC,CAAC;AACF,MAAM,MAAM,eAAe,CAAC,CAAC,EAAE,CAAC,IAAI,CACnC,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,cAAc,KACnB,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;AAyB5C,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI;IAC9B,QAAQ,EAAE,CAAC,CAAC;IACZ,OAAO,EAAE,WAAW,CAAC;IACrB,IAAI,CAAC,EAAE,aAAa,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI;IAC7B,OAAO,EAAE,CAAC,CAAC;IACX,OAAO,EAAE,WAAW,CAAC;IACrB,IAAI,CAAC,EAAE,aAAa,CAAC;CACrB,CAAC;AAEF,MAAM,WAAW,SAAS,CAAC,CAAC,EAAE,CAAC,CAAE,SAAQ,aAAa;IACrD,OAAO,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IACtC,QAAQ,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;~~CACxC~~;AAED,qBACa,GAAG,CAAC,CAAC,EAAE,CAAC,CAAE,SAAQ,OAAO,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7E,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,gBAAgB,CAAC,CAA0C;IACnE,OAAO,CAAC,iBAAiB,CAGvB;IACF,OAAO,CAAC,YAAY,CAA2C;IAC/D,OAAO,CAAC,wBAAwB,CAAW;IAC3C,OAAO,CAAC,aAAa,CAAmB;IACxC,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,gBAAgB,CAA8C;IACtE,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,mBAAmB,CAAuC;IAClE,OAAO,CAAC,kBAAkB,CAAuC;IAE3D,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;~~YAcxC~~,MAAM;IAUP,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAKvC,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAKnD,OAAO,CAAC,YAAY,CAAmC;IACjD,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;YAkBlB,UAAU;~~YAoGV~~,IAAI;IAiClB,OAAO,CAAC,iBAAiB;IA4BzB;;;;OAIG;IACU,IAAI,CAChB,OAAO,EAAE,CAAC,EACV,OAAO,CAAC,EAAE,cAAc,GACtB,OAAO,CAAC,IAAI,CAAC;IAOhB,OAAO,CAAC,qBAAqB;IAqD7B,OAAO,CAAC,qBAAqB;~~IAoD7B~~;;;;;OAKG;IACU,OAAO,CACnB,OAAO,EAAE,CAAC,EACV,OAAO,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAC5B,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;IAgI5B,IAAW,KAAK,IAAI,MAAM,CAKzB;IAED,SAAS,IAAI,MAAM,EAAE;CAGrB"}
1	+ {"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/controller.ts"],"names":[],"mappings":"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"}

package/dist/src/controller.js CHANGED Viewed

@@ -74,6 +74,7 @@ let RPC = (() => {
         }
         _subscribed = false;
         _responseHandler;
+        _resolveRequest;
         _responseResolver;
         _requestType;
         _requestTypeIsUint8Array;
@@ -86,6 +87,7 @@ let RPC = (() => {
         async open(args) {
             this._rpcTopic = args.topic ?? this._rpcTopic;
             this._responseHandler = args.responseHandler;
+            this._resolveRequest = args.resolveRequest;
             this._requestType = args.queryType;
             this._requestTypeIsUint8Array = this._requestType === Uint8Array;
             this._responseType = args.responseType;
@@ -126,13 +128,44 @@ let RPC = (() => {
         async _onMessage(evt) {
             const { data, message } = evt.detail;
             if (data?.topics.find((x) => x === this.topic) != null) {
+                let rpcMessage;
+                try {
+                    rpcMessage = deserialize(data.data, RPCMessage);
+                }
+                catch (error) {
+                    if (error instanceof BorshError) {
+                        // The envelope itself is not an RPCMessage: another protocol
+                        // sharing the topic. This is the only BorshError that is safe
+                        // to treat as "not for us".
+                        logger.trace("Got message for a different namespace");
+                        return;
+                    }
+                    logger.error("Error decoding RPC message: " +
+                        (error?.message ? error?.message?.toString() : error));
+                    return;
+                }
+                let stage = "decode-request";
                 try {
-                    const rpcMessage = deserialize(data.data, RPCMessage);
                     if (rpcMessage instanceof RequestV0) {
                         if (this._responseHandler) {
-                            const maybeEncrypted = rpcMessage.request;
-                            const decrypted = await maybeEncrypted.decrypt(this.node.services.keychain);
-                            const request = this._getRequestValueFn(decrypted);
+                            let request;
+                            try {
+                                request = this._resolveRequest?.(message);
+                            }
+                            catch (error) {
+                                // A throwing resolve hook must fall back to the
+                                // normal decode path (the documented contract:
+                                // "semantics never diverge"), not drop the message.
+                                logger.error("resolveRequest hook threw; falling back to decode: " +
+                                    (error instanceof Error ? error.message : String(error)));
+                                request = undefined;
+                            }
+                            if (request === undefined) {
+                                const maybeEncrypted = rpcMessage.request;
+                                const decrypted = await maybeEncrypted.decrypt(this.node.services.keychain);
+                                request = this._getRequestValueFn(decrypted);
+                            }
+                            stage = "handle-request";
                             let from = message.header.signatures.publicKeys[0];
                             this.events.dispatchEvent(new CustomEvent("request", {
                                 // TODO should this event also be emitted if the responseHandler is omitted?
@@ -150,7 +183,9 @@ let RPC = (() => {
                             });
                             if (response && rpcMessage.respondTo) {
                                 // send query and wait for replies in a generator like behaviour
+                                stage = "encode-response";
                                 const serializedResponse = serialize(response);
+                                stage = "publish-response";
                                 // we use the peerId/libp2p identity for signatures, since we want to be able to send a message
                                 // with pubsub with a certain receiver. If we use (this.identity) we are going to use an identity
                                 // that is now known in the .pubsub network, hence the message might not be delivired if we
@@ -175,6 +210,7 @@ let RPC = (() => {
                         }
                     }
                     else if (rpcMessage instanceof ResponseV0) {
+                        stage = "dispatch-response";
                         const id = toBase64(rpcMessage.requestId);
                         const handler = this._responseResolver.get(id);
                         // TODO evaluate when and how handler can be missing
@@ -190,7 +226,17 @@ let RPC = (() => {
                         return;
                     }
                     if (error instanceof BorshError) {
-                        logger.error("Got message for a different namespace");
+                        // Past the envelope decode this is OUR payload failing to
+                        // (de)serialize — e.g. a response embedding entries that
+                        // cannot be re-serialized. Swallowing it silently makes the
+                        // requester time out with no trace, so surface it.
+                        logger.error("RPC serialization failed at stage " +
+                            stage +
+                            ": " +
+                            error.message);
+                        this.events.dispatchEvent(new CustomEvent("codecError", {
+                            detail: { error, stage, message },
+                        }));
                         return;
                     }
                     logger.error("Error handling query: " +
@@ -280,6 +326,7 @@ let RPC = (() => {
         }
         createResponseHandler(promise, keypair, allResults, responders, expectedResponders, options) {
             return async (properties) => {
+                let decoded = false;
                 try {
                     const { response, message } = properties;
                     const from = message.header.signatures.publicKeys[0];
@@ -289,6 +336,7 @@ let RPC = (() => {
                     const maybeEncrypted = response.response;
                     const decrypted = await maybeEncrypted.decrypt(keypair);
                     const resultData = this._getResponseValueFn(decrypted);
+                    decoded = true;
                     this.handleDecodedResponse({
                         response: resultData,
                         message: message,
@@ -300,8 +348,26 @@ let RPC = (() => {
                         return; // Ignore things we can not open
                     }
                     if (error instanceof BorshError) {
-                        logger.trace("Namespace error");
-                        return; // Name space conflict most likely
+                        if (decoded) {
+                            // The response decoded fine; the error came from a
+                            // consumer callback afterwards. Don't misreport it as
+                            // a codec failure (control flow matches other swallows).
+                            logger.error("Error handling decoded RPC response: " + error.message);
+                            return;
+                        }
+                        // The response was addressed to us (encrypted to this
+                        // request's keypair) but its payload failed to decode —
+                        // that is a codec bug, not a namespace conflict. Keep the
+                        // request alive for other responders, but surface it.
+                        logger.error("Failed to decode RPC response: " + error.message);
+                        this.events.dispatchEvent(new CustomEvent("codecError", {
+                            detail: {
+                                error,
+                                stage: "decode-response",
+                                message: properties.message,
+                            },
+                        }));
+                        return;
                     }
                     logger.error("failed ot deserialize query response: " + error?.message);
                     promise.reject(error);

package/dist/src/controller.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"controller.js","sourceRoot":"","sources":["../../src/controller.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"controller.js","sourceRoot":"","sources":["../../src/controller.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@peerbit/rpc",
-  "version": "6.0.35",
+  "version": "6.1.1",
   "description": "RPC calls for peers",
   "sideEffects": false,
   "type": "module",
@@ -54,16 +54,16 @@
   "dependencies": {
     "@dao-xyz/borsh": "^6.0.0",
     "p-defer": "^4.0.0",
-    "@peerbit/crypto": "3.1.1",
+    "@peerbit/crypto": "3.1.2",
     "@peerbit/logger": "2.0.1",
-    "@peerbit/program": "6.0.31",
+    "@peerbit/pubsub": "5.3.0",
+    "@peerbit/program": "6.0.33",
     "@peerbit/time": "3.0.0",
-    "@peerbit/pubsub-interface": "5.1.4",
-    "@peerbit/stream-interface": "6.0.10",
-    "@peerbit/pubsub": "5.2.11"
+    "@peerbit/pubsub-interface": "5.1.5",
+    "@peerbit/stream-interface": "6.0.11"
   },
   "devDependencies": {
-    "@peerbit/test-utils": "3.0.35"
+    "@peerbit/test-utils": "3.1.3"
   },
   "scripts": {
     "clean": "aegir clean",

package/src/controller.ts CHANGED Viewed

@@ -44,6 +44,13 @@ export type RPCSetupOptions<Q, R> = {
 	queryType: AbstractType<Q>;
 	responseType: AbstractType<R>;
 	responseHandler?: ResponseHandler<Q, R>;
+	/**
+	 * Opt-in fast path: resolve the request object for an inbound message
+	 * without decoding `RequestV0.request` (e.g. from a native wire stash
+	 * keyed by the message id). Returning undefined falls back to the normal
+	 * decrypt + deserialize path, so semantics never diverge.
+	 */
+	resolveRequest?: (message: DataMessage) => Q | undefined;
 };
 export type RequestContext = {
 	from?: PublicSignKey;
@@ -90,15 +97,29 @@ export type RequestEvent<R> = {
 	from?: PublicSignKey;
 };
+export type CodecErrorEvent = {
+	error: Error;
+	stage:
+		| "decode-request"
+		| "handle-request"
+		| "encode-response"
+		| "publish-response"
+		| "dispatch-response"
+		| "decode-response";
+	message: DataMessage;
+};
 export interface RPCEvents<Q, R> extends ProgramEvents {
 	request: CustomEvent<RequestEvent<Q>>;
 	response: CustomEvent<ResponseEvent<R>>;
+	codecError: CustomEvent<CodecErrorEvent>;
 }
 @variant("rpc")
 export class RPC<Q, R> extends Program<RPCSetupOptions<Q, R>, RPCEvents<Q, R>> {
 	private _subscribed = false;
 	private _responseHandler?: ResponseHandler<Q, (R | undefined) | R>;
+	private _resolveRequest?: (message: DataMessage) => Q | undefined;
 	private _responseResolver!: Map<
 		string,
 		(properties: { response: ResponseV0; message: DataMessage }) => any
@@ -115,6 +136,7 @@ export class RPC<Q, R> extends Program<RPCSetupOptions<Q, R>, RPCEvents<Q, R>> {
 	async open(args: RPCSetupOptions<Q, R>): Promise<void> {
 		this._rpcTopic = args.topic ?? this._rpcTopic;
 		this._responseHandler = args.responseHandler;
+		this._resolveRequest = args.resolveRequest;
 		this._requestType = args.queryType;
 		this._requestTypeIsUint8Array = (this._requestType as any) === Uint8Array;
 		this._responseType = args.responseType;
@@ -169,15 +191,48 @@ export class RPC<Q, R> extends Program<RPCSetupOptions<Q, R>, RPCEvents<Q, R>> {
 		const { data, message } = evt.detail;
 		if (data?.topics.find((x) => x === this.topic) != null) {
+			let rpcMessage: RPCMessage;
+			try {
+				rpcMessage = deserialize(data.data, RPCMessage);
+			} catch (error: any) {
+				if (error instanceof BorshError) {
+					// The envelope itself is not an RPCMessage: another protocol
+					// sharing the topic. This is the only BorshError that is safe
+					// to treat as "not for us".
+					logger.trace("Got message for a different namespace");
+					return;
+				}
+				logger.error(
+					"Error decoding RPC message: " +
+						(error?.message ? error?.message?.toString() : error),
+				);
+				return;
+			}
+			let stage: CodecErrorEvent["stage"] = "decode-request";
 			try {
-				const rpcMessage = deserialize(data.data, RPCMessage);
 				if (rpcMessage instanceof RequestV0) {
 					if (this._responseHandler) {
-						const maybeEncrypted = rpcMessage.request;
-						const decrypted = await maybeEncrypted.decrypt(
-							this.node.services.keychain,
-						);
-						const request = this._getRequestValueFn(decrypted);
+						let request: Q | undefined;
+						try {
+							request = this._resolveRequest?.(message);
+						} catch (error) {
+							// A throwing resolve hook must fall back to the
+							// normal decode path (the documented contract:
+							// "semantics never diverge"), not drop the message.
+							logger.error(
+								"resolveRequest hook threw; falling back to decode: " +
+									(error instanceof Error ? error.message : String(error)),
+							);
+							request = undefined;
+						}
+						if (request === undefined) {
+							const maybeEncrypted = rpcMessage.request;
+							const decrypted = await maybeEncrypted.decrypt(
+								this.node.services.keychain,
+							);
+							request = this._getRequestValueFn(decrypted);
+						}
+						stage = "handle-request";
 						let from = message.header.signatures!.publicKeys[0];
 						this.events.dispatchEvent(
@@ -200,7 +255,9 @@ export class RPC<Q, R> extends Program<RPCSetupOptions<Q, R>, RPCEvents<Q, R>> {
 						if (response && rpcMessage.respondTo) {
 							// send query and wait for replies in a generator like behaviour
+							stage = "encode-response";
 							const serializedResponse = serialize(response);
+							stage = "publish-response";
 							// we use the peerId/libp2p identity for signatures, since we want to be able to send a message
 							// with pubsub with a certain receiver. If we use (this.identity) we are going to use an identity
@@ -238,6 +295,7 @@ export class RPC<Q, R> extends Program<RPCSetupOptions<Q, R>, RPCEvents<Q, R>> {
 						}
 					}
 				} else if (rpcMessage instanceof ResponseV0) {
+					stage = "dispatch-response";
 					const id = toBase64(rpcMessage.requestId);
 					const handler = this._responseResolver.get(id);
 					// TODO evaluate when and how handler can be missing
@@ -253,7 +311,21 @@ export class RPC<Q, R> extends Program<RPCSetupOptions<Q, R>, RPCEvents<Q, R>> {
 				}
 				if (error instanceof BorshError) {
-					logger.error("Got message for a different namespace");
+					// Past the envelope decode this is OUR payload failing to
+					// (de)serialize — e.g. a response embedding entries that
+					// cannot be re-serialized. Swallowing it silently makes the
+					// requester time out with no trace, so surface it.
+					logger.error(
+						"RPC serialization failed at stage " +
+							stage +
+							": " +
+							error.message,
+					);
+					this.events.dispatchEvent(
+						new CustomEvent<CodecErrorEvent>("codecError", {
+							detail: { error, stage, message },
+						}),
+					);
 					return;
 				}
@@ -406,6 +478,7 @@ export class RPC<Q, R> extends Program<RPCSetupOptions<Q, R>, RPCEvents<Q, R>> {
 			response: ResponseV0;
 			message: DataMessage;
 		}) => {
+			let decoded = false;
 			try {
 				const { response, message } = properties;
 				const from = message.header.signatures!.publicKeys[0];
@@ -417,6 +490,7 @@ export class RPC<Q, R> extends Program<RPCSetupOptions<Q, R>, RPCEvents<Q, R>> {
 				const maybeEncrypted = response.response;
 				const decrypted = await maybeEncrypted.decrypt(keypair);
 				const resultData = this._getResponseValueFn(decrypted);
+				decoded = true;
 				this.handleDecodedResponse(
 					{
@@ -436,8 +510,32 @@ export class RPC<Q, R> extends Program<RPCSetupOptions<Q, R>, RPCEvents<Q, R>> {
 				}
 				if (error instanceof BorshError) {
-					logger.trace("Namespace error");
-					return; // Name space conflict most likely
+					if (decoded) {
+						// The response decoded fine; the error came from a
+						// consumer callback afterwards. Don't misreport it as
+						// a codec failure (control flow matches other swallows).
+						logger.error(
+							"Error handling decoded RPC response: " + error.message,
+						);
+						return;
+					}
+					// The response was addressed to us (encrypted to this
+					// request's keypair) but its payload failed to decode —
+					// that is a codec bug, not a namespace conflict. Keep the
+					// request alive for other responders, but surface it.
+					logger.error(
+						"Failed to decode RPC response: " + error.message,
+					);
+					this.events.dispatchEvent(
+						new CustomEvent<CodecErrorEvent>("codecError", {
+							detail: {
+								error,
+								stage: "decode-response",
+								message: properties.message,
+							},
+						}),
+					);
+					return;
 				}
 				logger.error("failed ot deserialize query response: " + error?.message);