lib.binary refactor, updateProfile() work

Author: neuroscr

lib/open_group_v3.js

@@ -5,72 +5,7 @@ const protobuf = require('./protobuf.js')
 //const _sodium = require('libsodium-wrappers')
 const _sodium = require('libsodium-wrappers-sumo') // maybe put in session-client?
 //const crypto = require('crypto')
-
-// move to a binary utility lib
-const concatUInt8Array = (...args) => {
- const totalLength = args.reduce((acc, current) => acc + current.length, 0)
-
- const concatted = new Uint8Array(totalLength)
- let currentIndex = 0
- args.forEach(arr => {
- concatted.set(arr, currentIndex)
- currentIndex += arr.length
- })
-
- return concatted
-}
-
-/**
- * Take a string value with the given encoding and converts it to an `ArrayBuffer`.
- * @param value The string value.
- * @param encoding The encoding of the string value.
- */
-function encode(value, encoding) {
- //return ByteBuffer.wrap(value, encoding).toArrayBuffer();
- const buf = Buffer.from(value, encoding)
- const ab = new ArrayBuffer(buf.length)
- const view = new Uint8Array(ab)
- for (let i = 0; i < buf.length; ++i) {
- view[i] = buf[i]
- }
- return ab
-}
-
-/**
- * Take a buffer and convert it to a string with the given encoding.
- * @param buffer The buffer.
- * @param stringEncoding The encoding of the converted string value.
- */
-function decode(buffer, stringEncoding) {
- const buf = Buffer.from(buffer.buffer, buffer.byteOffset, buffer.byteLength)
- return buf.toString(stringEncoding)
- // [] or Uint8Array
- //console.log('typeof', typeof(buffer), buffer)
- //return ByteBuffer.wrap(buffer).toString(stringEncoding);
-}
-
-const fromUInt8ArrayToBase64 = d => decode(d, 'base64')
-
-function fromBase64ToUint8Array(base64Str) {
- const buf = Buffer.from(base64Str, 'base64')
- return new Uint8Array(buf.buffer)
-}
-
-const stringToArrayBuffer = str => {
- if (typeof str !== 'string') {
- throw new TypeError("'string' must be a string")
- }
-
- return encode(str, 'binary')
-}
-
-const stringToUint8Array = str => {
- if (!str) {
- return new Uint8Array()
- }
-
- return new Uint8Array(stringToArrayBuffer(str))
-}
+const binary = require('./lib.binary.js')
 
 // OnionSending in https://github.com/oxen-io/session-desktop/blob/0794edeb69aac582187da35771dc29ae3e68279c/ts/session/onions/onionSend.ts#L36
 // NOTE some endpoints require decoded strings
@@ -94,7 +29,7 @@ async function getOurOGHeaders(serverPubKeyHex, endpoint, method, blinded, body,
  const timestamp = Math.floor(Date.now() / 1000)
  //const nonce = new Uint8Array(16)
  const nonce = await sodium.randombytes_buf(16)
- const srvU8A = loki_crypto.hexStringToUint8Array(serverPubKeyHex)
+ const srvU8A = binary.hexStringToUint8Array(serverPubKeyHex)
 
  let pubkey, ka, kA
  // https://github.com/oxen-io/session-desktop/blob/0794edeb69aac582187da35771dc29ae3e68279c/ts/session/types/PubKey.ts#L5
@@ -116,7 +51,7 @@ async function getOurOGHeaders(serverPubKeyHex, endpoint, method, blinded, body,
  // requires front /
  //console.log('endpoint', endpoint)
  const rawPath = endpointRequiresDecoding(endpoint) // this gets a string of the path with potentially emojis in it
- const encodedPath = new Uint8Array(encode(rawPath, 'utf8')) // this gets the binary content of that utf8 string
+ const encodedPath = new Uint8Array(binary.encode(rawPath, 'utf8')) // this gets the binary content of that utf8 string
 
  //const srvPubKeyBuf = Buffer.from(serverPubKeyHex, 16)
  //console.log('srvPubKeyBuf', srvPubKeyBuf)
@@ -130,8 +65,8 @@ async function getOurOGHeaders(serverPubKeyHex, endpoint, method, blinded, body,
  }
  */
  //console.debug('serverPubKeyHex', serverPubKeyHex, 'timestamp', timestamp, 'method', method, 'path', endpoint, 'body', body)
- const tsU8a = stringToUint8Array(timestamp.toString())
- const methU8a = stringToUint8Array(method)
+ const tsU8a = binary.stringToUint8Array(timestamp.toString())
+ const methU8a = binary.stringToUint8Array(method)
  if (0) {
  console.log('srvU8A', srvU8A)
  console.log('nonce', nonce)
@@ -140,7 +75,7 @@ async function getOurOGHeaders(serverPubKeyHex, endpoint, method, blinded, body,
  console.log('encodedPath', encodedPath)
  }
 
- let toSign = concatUInt8Array(
+ let toSign = binary.concatUInt8Array(
  srvU8A,
  nonce,
  tsU8a,
@@ -150,16 +85,16 @@ async function getOurOGHeaders(serverPubKeyHex, endpoint, method, blinded, body,
 
  if (body) {
  // body hash to signature
- toSign = concatUInt8Array(toSign, sodium.crypto_generichash(64, body))
+ toSign = binary.concatUInt8Array(toSign, sodium.crypto_generichash(64, body))
  }
 
  const signature = await loki_crypto.getSogsSignature(blinded, ka, kA, signingKeys, toSign)
 
  return {
  'X-SOGS-Pubkey': pubkey, // user pubkey
  'X-SOGS-Timestamp': '' + timestamp,
- 'X-SOGS-Nonce': fromUInt8ArrayToBase64(nonce),
- 'X-SOGS-Signature': fromUInt8ArrayToBase64(signature),
+ 'X-SOGS-Nonce': binary.fromUInt8ArrayToBase64(nonce),
+ 'X-SOGS-Signature': binary.fromUInt8ArrayToBase64(signature),
  };
 }
 
@@ -191,47 +126,18 @@ async function sogs_rpcv3(method, endpoint, querystring, body, baseUrl, serverPu
  return result
 }
 
-/*
-async function getToken(baseUrl, room, serverPubKeyHex, privKey, pubkeyHex) {
- const result = await lib.lsrpc(baseUrl, 'public_key=' + pubkeyHex, serverPubKeyHex,
- 'auth_token_challenge', 'GET', '', { Room: room })
- //console.log('result', result)
- if (!result || !result.challenge || !result.challenge.ciphertext || !result.challenge.ephemeral_public_key) {
- console.error('open_group_v3::getToken - result', typeof (result), result)
- return
- }
- // decode everything into buffer format
- const ephermalPubBuf = Buffer.from(result.challenge.ephemeral_public_key, 'base64')
- const cipherTextBuf = Buffer.from(result.challenge.ciphertext, 'base64')
-
- const symmetricKey = loki_crypto.makeOnionSymKey(privKey, ephermalPubBuf)
- const tokenBuf = loki_crypto.decryptGCM(symmetricKey, cipherTextBuf)
-
- const tokenHex = tokenBuf.toString('hex') // fix up type
-
- const pkJSON = JSON.stringify({ public_key: pubkeyHex })
- try {
- const activateRes = await lib.lsrpc(baseUrl, '', serverPubKeyHex,
- 'claim_auth_token', 'POST', pkJSON, { Room: room, Authorization: tokenHex })
- //
- if (activateRes.status_code !== 200) {
- console.error('open_group_v3::getToken - claim_auth_token failure', activateRes)
- return
- }
- //console.log('activated', tokenHex)
- return tokenHex
- } catch (e) {
- console.error('open_group_v3::getToken - exception', e)
- }
-}
-*/
-
 // for multiple keypairs, servers and rooms
 class SessionOpenGroupV3Manager {
  constructor(options = {}) {
  this.servers = {}
  }
 
+ updateProfile(keypair, displayName, profileInfo) {
+ for(const url in this.servers) {
+ this.servers[url].updateProfile(keypair, displayName, profileInfo)
+ }
+ }
+
  joinServer(baseURL, serverPubkeyHex, options) {
  if (this.servers[baseURL]) {
  console.log('SessionOpenGroupV3Manager::joinServer - already joined', baseURL)
@@ -285,6 +191,17 @@ class SessionOpenGroupV3Server {
  return keypair.publicKeyHex + '_' + room
  }
 
+ updateProfile(keypair, displayName, profileInfo) {
+ // search rooms for rooms with this keypair
+ for(const kp_name in this.rooms) {
+ const parts = kp_name.split('_', 2)
+ const pkHex = parts[0]
+ if (pkHex === keypair.publicKeyHex) {
+ this.rooms[kp_name].updateProfile(displayName, profileInfo)
+ }
+ }
+ }
+
  // header support?
  // keypair, endpoint, body, querystring, method
  async rpc(method, endpoint, querystring, body, keypair) {
@@ -721,6 +638,8 @@ class SessionOpenGroupV3Room {
  // active_users, active_users_cutoff, admins, created, image_id, info_updates,
  // message_sequence, moderators, name, read, token, upload, write
  this.roomData = {}
+ this.displayName = undefined
+ this.profileInfo = undefined
  }
 
  async ensureToken() {
@@ -742,7 +661,7 @@ class SessionOpenGroupV3Room {
  }
  if (this.server.blinded) {
  // srvkey + ourkey => blindedkey
- const srvU8A = loki_crypto.hexStringToUint8Array(this.server.serverPubkeyHex)
+ const srvU8A = binary.hexStringToUint8Array(this.server.serverPubkeyHex)
  const blindingValues = await loki_crypto.getBlindingValues(srvU8A, this.keypair.ed25519KeyPair)
  //console.log('blindingValues', blindingValues)
  const ka = blindingValues.secretKey
@@ -760,6 +679,11 @@ class SessionOpenGroupV3Room {
  // DELETE token
  }
 
+ updateProfile(keypair, displayName, profileInfo) {
+ if (displayName !== undefined) this.displayName = displayName
+ if (profileInfo !== undefined) this.profileInfo = profileInfo
+ }
+
  async send(text, options = {}) {
  await this.ensureToken()
  try {
@@ -768,6 +692,15 @@ class SessionOpenGroupV3Room {
 
  // padPlainTextBuffer returns uint8 array
  // probably should be creating a OpenGroupMessageV2 message
+
+ // we need to inject profile stuff into options...
+ if (options.profile === undefined) {
+ options.profile = {
+ displayName: this.displayName,
+ avatar: this.profileInfo?.avatar_image?.url,
+ }
+ }
+
  const plaintextBuf = Buffer.from(protobuf.encodeContentMessage(text, ts, options))
 
  // maybe we should sign it with our pubkey, not the server's pubkey
@@ -778,7 +711,7 @@ class SessionOpenGroupV3Room {
  //console.log('signature', signature, signature.byteLength)
 
  // srvkey + ourkey => blindedkey
- const srvU8A = loki_crypto.hexStringToUint8Array(this.server.serverPubkeyHex)
+ const srvU8A = binary.hexStringToUint8Array(this.server.serverPubkeyHex)
  const blindingValues = await loki_crypto.getBlindingValues(srvU8A, this.keypair.ed25519KeyPair)
  //console.log('blindingValues', blindingValues)
  const ka = blindingValues.secretKey