logos-messaging/js-noise
1
0
Fork 0
mirror of https://github.com/logos-messaging/js-noise.git synced 2026-01-04 06:33:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

stub properties with undefined

Browse Source
This commit is contained in:
weboko 2023-01-26 02:04:10 +01:00
parent 6284482f24
commit ea5f124a0d
No known key found for this signature in database
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/codec.ts
View File

@ -43,6 +43,7 @@ export class NoiseHandshakeEncoder implements Encoder {
async toProtoObj(message: Partial<Message>): Promise<ProtoMessage | undefined> { async toProtoObj(message: Partial<Message>): Promise<ProtoMessage | undefined> {
const timestamp = message.timestamp ?? new Date(); const timestamp = message.timestamp ?? new Date();
return { return {
rateLimitProof: undefined,
payload: this.hsStepResult.payload2.serialize(), payload: this.hsStepResult.payload2.serialize(),
version: version, version: version,
contentTopic: this.contentTopic, contentTopic: this.contentTopic,
@ -64,7 +65,9 @@ export class NoiseHandshakeDecoder implements Decoder<NoiseHandshakeMessage> {
fromWireToProtoObj(bytes: Uint8Array): Promise<ProtoMessage | undefined> { fromWireToProtoObj(bytes: Uint8Array): Promise<ProtoMessage | undefined> {
const protoMessage = proto_message.WakuMessage.decode(bytes); const protoMessage = proto_message.WakuMessage.decode(bytes);
log("Message decoded", protoMessage); log("Message decoded", protoMessage);
return Promise.resolve(protoMessage); // TODO(@weboko): remove type casting when released
// https://github.com/waku-org/js-waku/pull/1136
return Promise.resolve(protoMessage as ProtoMessage);
} }
async fromProtoObj(proto: ProtoMessage): Promise<NoiseHandshakeMessage | undefined> { async fromProtoObj(proto: ProtoMessage): Promise<NoiseHandshakeMessage | undefined> {
@ -136,6 +139,7 @@ export class NoiseSecureTransferEncoder implements Encoder {
return { return {
payload, payload,
rateLimitProof: undefined,
version: version, version: version,
contentTopic: this.contentTopic, contentTopic: this.contentTopic,
timestamp: BigInt(timestamp.valueOf()) * OneMillion, timestamp: BigInt(timestamp.valueOf()) * OneMillion,
@ -159,7 +163,9 @@ export class NoiseSecureTransferDecoder implements Decoder<NoiseSecureMessage> {
fromWireToProtoObj(bytes: Uint8Array): Promise<ProtoMessage | undefined> { fromWireToProtoObj(bytes: Uint8Array): Promise<ProtoMessage | undefined> {
const protoMessage = proto_message.WakuMessage.decode(bytes); const protoMessage = proto_message.WakuMessage.decode(bytes);
log("Message decoded", protoMessage); log("Message decoded", protoMessage);
return Promise.resolve(protoMessage); // TODO(@weboko): remove type casting when released
// https://github.com/waku-org/js-waku/pull/1136
return Promise.resolve(protoMessage as ProtoMessage);
} }
async fromProtoObj(proto: ProtoMessage): Promise<NoiseSecureMessage | undefined> { async fromProtoObj(proto: ProtoMessage): Promise<NoiseSecureMessage | undefined> {

21
src/pairing.ts
View File

@ -258,7 +258,12 @@ export class WakuPairing {
// We prepare a message from initiator's payload2 // We prepare a message from initiator's payload2
// At this point wakuMsg is sent over the Waku network to responder content topic // At this point wakuMsg is sent over the Waku network to responder content topic
let encoder = new NoiseHandshakeEncoder(this.contentTopic, hsStep); let encoder = new NoiseHandshakeEncoder(this.contentTopic, hsStep);
await this.sender.publish(encoder, {}); await this.sender.publish(encoder, {
payload: undefined,
contentTopic: undefined,
timestamp: undefined,
rateLimitProof: undefined,
});
// We generate an authorization code using the handshake state // We generate an authorization code using the handshake state
// this check has to be confirmed with a user interaction, comparing auth codes in both ends // this check has to be confirmed with a user interaction, comparing auth codes in both ends
@ -294,7 +299,12 @@ export class WakuPairing {
}); });
encoder = new NoiseHandshakeEncoder(this.contentTopic, hsStep); encoder = new NoiseHandshakeEncoder(this.contentTopic, hsStep);
await this.sender.publish(encoder, {}); await this.sender.publish(encoder, {
payload: undefined,
contentTopic: undefined,
timestamp: undefined,
rateLimitProof: undefined,
});
// Secure Transfer Phase // Secure Transfer Phase
this.handshakeResult = this.handshake.finalizeHandshake(); this.handshakeResult = this.handshake.finalizeHandshake();
@ -333,7 +343,12 @@ export class WakuPairing {
// We prepare a Waku message from responder's payload2 // We prepare a Waku message from responder's payload2
const encoder = new NoiseHandshakeEncoder(this.contentTopic, hsStep); const encoder = new NoiseHandshakeEncoder(this.contentTopic, hsStep);
await this.sender.publish(encoder, {}); await this.sender.publish(encoder, {
payload: undefined,
contentTopic: undefined,
timestamp: undefined,
rateLimitProof: undefined,
});
// 3rd step // 3rd step
// -> sA, sAeB, sAsB {s} // -> sA, sAeB, sAsB {s}