@wireapp/avs 9.3.10 → 9.3.13

package/dist/avs_pc.js

@@ -12,11 +12,11 @@ var worker;
 // Use inlined worker instead....
 //let worker = new Worker('/worker/avs-worker.js', {name: 'AVS worker'});
 // This is the content of the avs-worker.js file, copied here.
-var workerContent = "\n\nvar coders = {};\n\nconst HDR_VERSION = 0;\n\n/*\nHeader\n\n                     1 1 1 1 1 1\n 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5\n+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n| V=0 |E|  RES  |S|LEN  |1|KLEN |\n+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n|     KID...  (length=KLEN)     |\n+-------------------------------+\n|      CTR... (length=LEN)      |\n+-------------------------------+\n\nExtensions\n\n 0 1 2 3 4 5 6 7\n+-+-+-+-+-+-+-+-+---------------------------+\n|M| ELN |  EID  |   VAL... (length=ELEN)    |\n+-+-+-+-+-+-+-+-+---------------------------+\n*/\n\nfunction calcLen(val) {\n    let l = 0;\n\n    if (val == 0)\n\treturn 1;\n\n    while (val != 0) {\n\tl++;\n\tval = val >>> 8;\t\n    }\n\n    return l;\n}\n\nfunction writeBytes(buf, p, len, val)\n{\n    switch (len) {\n    case 8:\n\tbuf[p] = (val >>> 56) & 0xff;\n\tp++;\n\n    case 7:\n\tbuf[p] = (val >>> 48) & 0xff;\n\tp++;\n\n    case 6:\n\tbuf[p] = (val >>> 40) & 0xff;\n\tp++;\n\t\n    case 5:\n\tbuf[p] = (val >>> 32) & 0xff;\n\tp++;\n\n    case 4:\n\tbuf[p] = (val >>> 24) & 0xff;\n\tp++;\n\n    case 3:\n\tbuf[p] = (val >>> 16) & 0xff;\n\tp++;\n\n    case 2:\n\tbuf[p] = (val >>> 8) & 0xff;\n\tp++;\n\n    case 1:\n\tbuf[p] = val & 0xff;\n\tbreak;\n\n    default:\n\treturn 0;\n    }\n    \n    return len;\n}\n\nfunction readBytes(buf, p, len) {\n    let l = len;\n    let v = 0;\n\n    while (l > 0) {\n\tv = v * 256;\n\tv = v + buf[p];\n\tp++;\n\tl--;\n    }\n\n    const lv = {\n\tlen: len,\n\tval: v\n    };\n    \n    return lv;\n}\n\nfunction frameHeaderDecode(buf) {\n\n    const MAX_EXTS = 16;\n    let ext = buf[0] & 0x10;\n    const flen = ((buf[1] >>> 4) & 0x7) + 1;\n    const x = (buf[1] >>> 3) & 0x1;\n    const klen = buf[1] & 0x7;\n    let p = 2;\n    let kid = -1;\n    let fid = -1;\n    let csrc = \"0\";\n    let i = 0;\n\n    if (x) {\n\tconst lv = readBytes(buf, p, klen + 1);\n\n\tp += lv.len;\n\tkid = lv.val;\n    }\n    else {\n\tkid = klen;\n    }\n\n    const lv = readBytes(buf, p, flen);\n    p += lv.len;\n    fid = lv.val;\n\n    while(ext && p < buf.length && i < MAX_EXTS) {\n\tconst b = buf[p];\n\text = b & 0x80;\n\tconst elen = ((b >>> 4) & 0x7) + 1;\n\tconst eid = (b & 0xf);\n\n        if (eid == 1 && elen == 4) {\n            const csrco = readBytes(buf, p + 1, elen);\n            csrc = csrco.val.toString();\n        }\n        p += elen + 1;\n        i++;\n    }\n\n    if (kid < 0 || fid < 0) {\n\treturn null;\n    }\n    else {\n\tconst frameHdr = {\n\t    len: p,\n\t    frameId: fid,\n\t    keyId: kid,\n\t    csrc: csrc\n\t}\n\treturn frameHdr;\n    }\n}\n\nfunction frameHeaderEncode(fid, kid, csrc)\n{\n    const ab = new ArrayBuffer(32);\n    const buf = new Uint8Array(ab);\n    let sig = 0;\n    let x = 0;\n    let klen = 0;\n    let flen = 0;\n    let p = 2;\n    let ext = (csrc > 0) ? 1 : 0;\n\n    if (kid > 7) {\n\tx = 1;\n\tklen = calcLen(kid) - 1;\n    }\n    else {\n\tklen = kid;\n    }\n\n    flen = calcLen(fid);\n\n    buf[0] = (HDR_VERSION << 5) + (ext << 4);\n    buf[1] = (sig << 7) + ((flen - 1) << 4) + (x << 3) + klen;\n    if (x) {\n\tp += writeBytes(buf, p, klen + 1, kid);\n    }\n    p += writeBytes(buf, p, flen, fid);\n\n    if (csrc > 0) {\n        buf[p] = 0x31;\n        p++;\n        p+= writeBytes(buf, p, 4, csrc);\n    }\n    return buf.subarray(0, p);\n}\n\nfunction xor_iv(iv, fid, kid) {\n  const oiv = new Uint8Array(iv);\n\n  oiv[0] = oiv[0] ^ ((fid >> 24) & 0xFF);\n  oiv[1] = oiv[1] ^ ((fid >> 16) & 0xFF);\n  oiv[2] = oiv[2] ^ ((fid >>  8) & 0xFF);\n  oiv[3] = oiv[3] ^ ((fid      ) & 0xFF);\n  oiv[4] = oiv[4] ^ ((kid >> 24) & 0xFF);\n  oiv[5] = oiv[5] ^ ((kid >> 16) & 0xFF);\n  oiv[6] = oiv[6] ^ ((kid >>  8) & 0xFF);\n  oiv[7] = oiv[7] ^ ((kid      ) & 0xFF);\n\n  return oiv;\n}\n\nfunction getMediaKey(self, index) {\n    postMessage({\n\top: \"getMediaKey\",\n\tself: self,\n\tindex: index\n    });\n}\n\nfunction getCurrentMediaKey(self, index) {\n    postMessage({\n\top: \"getCurrentMediaKey\",\n\tself: self\n    });\n}\n\nfunction doLog(str) {\n  postMessage({\n\top: \"log\",\n\tlevel: 1,\n\tlogString: str\n  });\n}\n\nfunction encryptFrame(coder, rtcFrame, controller) {\n  const dataBuf = rtcFrame.data;\n  const data = new Uint8Array(dataBuf);\n  const t = Object.prototype.toString.call(rtcFrame);\n  const isVideo = t === '[object RTCEncodedVideoFrame]';\n  const userid = \"self\";\n\n  const meta = rtcFrame.getMetadata();\n  const ssrc = meta.synchronizationSource;\n\n  if (isVideo && !coder.video.first_recv) {\n    doLog(\"frame_enc: encrypt: first frame received type: video uid: \" +\n          userid + \" fid: \" + coder.frameId + \" ssrc: \" + ssrc);\n    coder.video.first_recv = true;\n    coder.video.first_succ = false;\n  }\n  if (!isVideo && !coder.audio.first_recv) {\n    doLog(\"frame_enc: encrypt: first frame received type: audio uid: \" +\n          userid + \" fid: \" + coder.frameId + \" ssrc: \" + ssrc);\n    coder.audio.first_recv = true;\n    coder.audio.first_succ = false;\n  }\n\n  if (coder.currentKey == null) {\n    getCurrentMediaKey(coder.self);\n    return;\n  }\n\n  const baseiv = isVideo ? coder.video.iv : coder.audio.iv;\n  const iv = xor_iv(baseiv, coder.frameId, coder.currentKey.id);\n    \n  const hdr = frameHeaderEncode(coder.frameId, coder.currentKey.id, ssrc);\n  crypto.subtle.encrypt(\n    {\n      name: \"AES-GCM\",\n      iv: iv,\n      tagLength: 128,\n      additionalData: hdr\n    },\n    coder.currentKey.key,\n    data\n  )\n  .then(function(encdata){\n    const enc8 = new Uint8Array(encdata);  \t    \n    const enc = new Uint8Array(hdr.length + enc8.length);\n      \n    enc.set(hdr);\n    enc.set(enc8, hdr.length);\n\n    rtcFrame.data = enc.buffer;\n    controller.enqueue(rtcFrame);\n\n    if (isVideo && !coder.video.first_succ) {\n      doLog(\"frame_enc: encrypt: first frame encrypted type: video uid: \" +\n            userid + \" fid: \" + coder.frameId + \" csrc: \" + ssrc);\n      coder.video.first_succ = true;\n    }\n    if (!isVideo && !coder.audio.first_succ) {\n      doLog(\"frame_enc: encrypt: first frame encrypted type: audio uid: \" +\n            userid + \" fid: \" + coder.frameId + \" csrc: \" + ssrc);\n      coder.audio.first_succ = true;\n    }\n\n    coder.frameId++;\n  });\n}\n\nfunction decryptFrame(coder, rtcFrame, controller) {\n  const dataBuf = rtcFrame.data;\n  const data = new Uint8Array(dataBuf);\n\n  const t = Object.prototype.toString.call(rtcFrame);\n  const isVideo = t === '[object RTCEncodedVideoFrame]'\n\n  const frameHdr = frameHeaderDecode(data);\n\n  if (frameHdr == null) {\n    doLog('decryptFrame: failed to decode frame header');\n    return;\n  }\n\n  const meta = rtcFrame.getMetadata();\n  let ssrc = meta.synchronizationSource.toString();\n  let csrc = null;\n  if (frameHdr.csrc != \"0\") {\n     csrc = frameHdr.csrc;\n  }\n  else if (meta.contributingSources && meta.contributingSources.length > 0) {\n     csrc = meta.contributingSources[0].toString();\n  }\n  else {\n     csrc = ssrc;\n  }\n\n  if (!csrc) {\n      doLog('decryptFrame: no csrc for ssrc ' + ssrc);\n      return;\n  }\n\n  let uinfo = null;\n  if (isVideo) {\n     uinfo = coder.video.users[csrc];\n  }\n  else {\n     uinfo = coder.audio.users[csrc];\n  }\n\n  if (!uinfo) {\n      doLog('decryptFrame: no userinfo for csrc: ' + csrc);\n      return;\n  }\n \n  //console.log('frame_dec: video ' + isVideo + ' ssrc ' + ssrc + ' csrc ' + csrc + ' user ' + uinfo.userid);\n\n  if (isVideo && uinfo.transp_ssrcv != ssrc) {\n      doLog(\"frame_dec: decrypt: first frame received type: video uid: \" +\n            uinfo.userid + \" fid: \" + frameHdr.frameId + \" csrc: \" + csrc);\n      uinfo.first_succ_video = false;\n\n      /* Only call videoStreamHandler for selective video */\n      if (uinfo.ssrcv != ssrc) {\n          for (const [key, u] of Object.entries(coder.video.users)) {\n              if (u.transp_ssrcv == ssrc) {\n                  postMessage({\n                      op: \"setvstream\",\n                      self: coder.self,\n                      userid: u.userid,\n                      clientid: u.clientid,\n                      ssrc: \"0\",\n                  });\n                  u.transp_ssrcv = null;\n              }\n          }\n\n          postMessage({\n              op: \"setvstream\",\n              self: coder.self,\n              userid: uinfo.userid,\n              clientid: uinfo.clientid,\n              ssrc: ssrc,\n          });\n      }\n      uinfo.transp_ssrcv = ssrc;\n  }\n\n  if (!isVideo && !uinfo.first_recv_audio) {\n    doLog(\"frame_dec: decrypt: first frame received type: audio uid: \" +\n          uinfo.userid + \" fid: \" + frameHdr.frameId + \" csrc: \" + csrc);\n    uinfo.first_recv_audio = true;\n    uinfo.first_succ_audio = false;\n  }\n  /*\n  console.log(\"coder[\" + coder.self + \"]\"\n\t+ \" len=\" + frameHdr.len\n\t+ \" kid=\"+ frameHdr.keyId\n\t+ \" fid=\" + frameHdr.frameId);\n  */\n\n  let kinfo = null;\n  for (i = 0; i < coder.keys.length; i++) {\n    if (coder.keys[i].id == frameHdr.keyId) {\n      kinfo = coder.keys[i];\n      break;\n    }\n  }\n\n  if (!kinfo) {\n    getMediaKey(coder.self, frameHdr.keyId);\n    return;\n  }\n\n  let iv = null;\n  if (isVideo) {\n    iv = xor_iv(uinfo.ivv, frameHdr.frameId, frameHdr.keyId);\n  }\n  else {\n    iv = xor_iv(uinfo.iva, frameHdr.frameId, frameHdr.keyId);\n  }\n\n  const hdr = data.subarray(0, frameHdr.len);\n  const dec = data.subarray(frameHdr.len);\n  crypto.subtle.decrypt(\n    {\n      name: \"AES-GCM\",\n      iv: iv,\n      tagLength: 128,\n      additionalData: hdr\n    },\n    kinfo.key,\n    dec\n  )\n  .then(function(decdata){\n    rtcFrame.data = decdata;\n    controller.enqueue(rtcFrame);\n    if (isVideo && !uinfo.first_succ_video) {\n      doLog(\"frame_dec: decrypt: first frame decrypted type: video uid: \" +\n            uinfo.userid + \" fid: \" + frameHdr.frameId + \" csrc: \" + csrc);\n      uinfo.first_succ_video = true;\n    }\n    if (!isVideo && !uinfo.first_succ_audio) {\n      doLog(\"frame_dec: decrypt: first frame decrypted type: audio uid: \" +\n            uinfo.userid + \" fid: \" + frameHdr.frameId + \" csrc: \" + csrc);\n      uinfo.first_succ_audio = true;\n    }\n  })\n  .catch(err => {\n     console.log(err);\n  });\n}\n\nonmessage = async (event) => {\n    const {op, self} = event.data;\n    doLog('AVS worker op=' + op + ' self=' + self);\n\n    let coder = coders[self];\n    if (!coder) {\n\tdoLog('AVS worker: no coder for self=' + self);\n    }    \n    /*\n    const {opinfo, readableStream, writableStream} = event.data;\n    const mval = opinfo.mtype === 'video' ? 1 : 0; // corresponds to enum frame_media_type\n    */\n    if (op === 'create') {\n\tconst { iva, ivv } = event.data;\n\tif (!coder) {\n\t    coder = {\n\t\tself: self,\n\t\tframeId: Math.floor(Math.random() * 4294967295),\n\t\tcurrentKey: null,\n\t\tkeys: [],\n\t\taudio: {\n\t\t    first_recv: false,\n\t\t    first_succ: false,\n\t\t    iv: iva,\n\t\t    users: {},\n\t\t},\n\t\tvideo: {\n\t\t    first_recv: false,\n\t\t    first_succ: false,\n\t\t    iv: ivv,\n\t\t    users: {},\n\t\t},\n\t    }\n\t    coders[self] = coder;\n\n\t    doLog('AVS worker: adding coder for self=' + self);\n\t}\n    }\n    else if (op === 'destroy') {\n\tcoders[self] = null;\n    }\n    else if (op === 'addUser') {\n\tif (!coder) {\n\t    doLog('addUser: no coder');\n\t    return;\n\t}\n\tconst {userInfo} = event.data;\n\n\tdoLog('addUser: adding audio ssrc: '+userInfo.ssrca);\n\tcoder.audio.users[userInfo.ssrca] = userInfo;\n\tif (userInfo.ssrcv != 0) {\n\t    coder.video.users[userInfo.ssrcv] = userInfo;\n\t}\n    }\n    else if (op === 'setupSender') {\n\tconst {readableStream, writableStream} = event.data;\n\n\tconst transformStream = new TransformStream({\n\t    transform: (frame, controller) => {encryptFrame(coder, frame, controller);},\n\t});\n\treadableStream\n          .pipeThrough(transformStream)\n            .pipeTo(writableStream);\n    }\n    else if (op === 'setupReceiver') {\n       const {readableStream, writableStream} = event.data;\n\n       if (!coder) {\n\t   doLog('setupSender: no coder for self=' + self);\n           return;\n       }\n\n       const transformStream = new TransformStream({\n\t   transform: (frame, controller) => {decryptFrame(coder, frame, controller);},\n       });\n       readableStream\n        .pipeThrough(transformStream)\n        .pipeTo(writableStream);       \n   }\n   else if (op === 'setMediaKey') {\n       const {index, current, key} = event.data;\n\n       doLog(\"setMediaKey: got key for: \" + self\n\t\t   + \" index=\" + index + \" current=\" + current\n\t\t   + \" keyLen=\" + key.length);\n\n       crypto.subtle.importKey(\n         \"raw\",\n         key,\n         \"AES-GCM\",\n         false,\n         [\"encrypt\", \"decrypt\"]\n       )\n       .then(function(k){\n         let kinfo = null;\n         for (i = 0; i < coder.keys.length; i++) {\n           if (coder.keys[i].id == index) {\n             coder.keys[i].key = k;\n             kinfo = coder.keys[i];\n             break;\n           }\n         }\n         if (!kinfo) {\n           kinfo = {id:index, key:k};\n           coder.keys.push(kinfo);\n         }\n         if (index == current)\n           coder.currentKey = kinfo;\n\n         while (coder.keys.length > 4) {\n           coder.keys.shift();\n         }\n       });\n   }    \n};\n";
+var workerContent = "\n\nvar coders = {};\n\nconst HDR_VERSION = 0;\n\n/*\nHeader\n\n                     1 1 1 1 1 1\n 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5\n+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n| V=0 |E|  RES  |S|LEN  |1|KLEN |\n+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n|     KID...  (length=KLEN)     |\n+-------------------------------+\n|      CTR... (length=LEN)      |\n+-------------------------------+\n\nExtensions\n\n 0 1 2 3 4 5 6 7\n+-+-+-+-+-+-+-+-+---------------------------+\n|M| ELN |  EID  |   VAL... (length=ELEN)    |\n+-+-+-+-+-+-+-+-+---------------------------+\n*/\n\nfunction calcLen(val) {\n    let l = 0;\n\n    if (val == 0)\n\treturn 1;\n\n    while (val != 0) {\n\tl++;\n\tval = val >>> 8;\t\n    }\n\n    return l;\n}\n\nfunction writeBytes(buf, p, len, val)\n{\n    switch (len) {\n    case 8:\n\tbuf[p] = (val >>> 56) & 0xff;\n\tp++;\n\n    case 7:\n\tbuf[p] = (val >>> 48) & 0xff;\n\tp++;\n\n    case 6:\n\tbuf[p] = (val >>> 40) & 0xff;\n\tp++;\n\t\n    case 5:\n\tbuf[p] = (val >>> 32) & 0xff;\n\tp++;\n\n    case 4:\n\tbuf[p] = (val >>> 24) & 0xff;\n\tp++;\n\n    case 3:\n\tbuf[p] = (val >>> 16) & 0xff;\n\tp++;\n\n    case 2:\n\tbuf[p] = (val >>> 8) & 0xff;\n\tp++;\n\n    case 1:\n\tbuf[p] = val & 0xff;\n\tbreak;\n\n    default:\n\treturn 0;\n    }\n    \n    return len;\n}\n\nfunction readBytes(buf, p, len) {\n    let l = len;\n    let v = 0;\n\n    while (l > 0) {\n\tv = v * 256;\n\tv = v + buf[p];\n\tp++;\n\tl--;\n    }\n\n    const lv = {\n\tlen: len,\n\tval: v\n    };\n    \n    return lv;\n}\n\nfunction frameHeaderDecode(buf) {\n\n    const MAX_EXTS = 16;\n    let ext = buf[0] & 0x10;\n    const flen = ((buf[1] >>> 4) & 0x7) + 1;\n    const x = (buf[1] >>> 3) & 0x1;\n    const klen = buf[1] & 0x7;\n    let p = 2;\n    let kid = -1;\n    let fid = -1;\n    let csrc = \"0\";\n    let i = 0;\n\n    if (x) {\n\tconst lv = readBytes(buf, p, klen + 1);\n\n\tp += lv.len;\n\tkid = lv.val;\n    }\n    else {\n\tkid = klen;\n    }\n\n    const lv = readBytes(buf, p, flen);\n    p += lv.len;\n    fid = lv.val;\n\n    while(ext && p < buf.length && i < MAX_EXTS) {\n\tconst b = buf[p];\n\text = b & 0x80;\n\tconst elen = ((b >>> 4) & 0x7) + 1;\n\tconst eid = (b & 0xf);\n\n        if (eid == 1 && elen == 4) {\n            const csrco = readBytes(buf, p + 1, elen);\n            csrc = csrco.val.toString();\n        }\n        p += elen + 1;\n        i++;\n    }\n\n    if (kid < 0 || fid < 0) {\n\treturn null;\n    }\n    else {\n\tconst frameHdr = {\n\t    len: p,\n\t    frameId: fid,\n\t    keyId: kid,\n\t    csrc: csrc\n\t}\n\treturn frameHdr;\n    }\n}\n\nfunction frameHeaderEncode(fid, kid, csrc)\n{\n    const ab = new ArrayBuffer(32);\n    const buf = new Uint8Array(ab);\n    let sig = 0;\n    let x = 0;\n    let klen = 0;\n    let flen = 0;\n    let p = 2;\n    let ext = (csrc > 0) ? 1 : 0;\n\n    if (kid > 7) {\n\tx = 1;\n\tklen = calcLen(kid) - 1;\n    }\n    else {\n\tklen = kid;\n    }\n\n    flen = calcLen(fid);\n\n    buf[0] = (HDR_VERSION << 5) + (ext << 4);\n    buf[1] = (sig << 7) + ((flen - 1) << 4) + (x << 3) + klen;\n    if (x) {\n\tp += writeBytes(buf, p, klen + 1, kid);\n    }\n    p += writeBytes(buf, p, flen, fid);\n\n    if (csrc > 0) {\n        buf[p] = 0x31;\n        p++;\n        p+= writeBytes(buf, p, 4, csrc);\n    }\n    return buf.subarray(0, p);\n}\n\nfunction xor_iv(iv, fid, kid) {\n  const oiv = new Uint8Array(iv);\n\n  oiv[0] = oiv[0] ^ ((fid >> 24) & 0xFF);\n  oiv[1] = oiv[1] ^ ((fid >> 16) & 0xFF);\n  oiv[2] = oiv[2] ^ ((fid >>  8) & 0xFF);\n  oiv[3] = oiv[3] ^ ((fid      ) & 0xFF);\n  oiv[4] = oiv[4] ^ ((kid >> 24) & 0xFF);\n  oiv[5] = oiv[5] ^ ((kid >> 16) & 0xFF);\n  oiv[6] = oiv[6] ^ ((kid >>  8) & 0xFF);\n  oiv[7] = oiv[7] ^ ((kid      ) & 0xFF);\n\n  return oiv;\n}\n\nfunction getMediaKey(self, index) {\n    postMessage({\n\top: \"getMediaKey\",\n\tself: self,\n\tindex: index\n    });\n}\n\nfunction getCurrentMediaKey(self, index) {\n    postMessage({\n\top: \"getCurrentMediaKey\",\n\tself: self\n    });\n}\n\nfunction doLog(str) {\n  postMessage({\n\top: \"log\",\n\tlevel: 1,\n\tlogString: str\n  });\n}\n\nfunction encryptFrame(coder, rtcFrame, controller) {\n  const dataBuf = rtcFrame.data;\n  const data = new Uint8Array(dataBuf);\n  const t = Object.prototype.toString.call(rtcFrame);\n  const isVideo = t === '[object RTCEncodedVideoFrame]';\n  const userid = \"self\";\n\n  const meta = rtcFrame.getMetadata();\n  const ssrc = meta.synchronizationSource;\n\n  if (isVideo && !coder.video.first_recv) {\n    doLog(\"frame_enc: encrypt: first frame received type: video uid: \" +\n          userid.substring(0,8) + \" fid: \" + coder.frameId + \" ssrc: \" + ssrc);\n    coder.video.first_recv = true;\n    coder.video.first_succ = false;\n  }\n  if (!isVideo && !coder.audio.first_recv) {\n    doLog(\"frame_enc: encrypt: first frame received type: audio uid: \" +\n          userid.substring(0,8) + \" fid: \" + coder.frameId + \" ssrc: \" + ssrc);\n    coder.audio.first_recv = true;\n    coder.audio.first_succ = false;\n  }\n\n  if (coder.currentKey == null) {\n    getCurrentMediaKey(coder.self);\n    return;\n  }\n\n  const baseiv = isVideo ? coder.video.iv : coder.audio.iv;\n  const iv = xor_iv(baseiv, coder.frameId, coder.currentKey.id);\n    \n  const hdr = frameHeaderEncode(coder.frameId, coder.currentKey.id, ssrc);\n  crypto.subtle.encrypt(\n    {\n      name: \"AES-GCM\",\n      iv: iv,\n      tagLength: 128,\n      additionalData: hdr\n    },\n    coder.currentKey.key,\n    data\n  )\n  .then(function(encdata){\n    const enc8 = new Uint8Array(encdata);  \t    \n    const enc = new Uint8Array(hdr.length + enc8.length);\n      \n    enc.set(hdr);\n    enc.set(enc8, hdr.length);\n\n    rtcFrame.data = enc.buffer;\n    controller.enqueue(rtcFrame);\n\n    if (isVideo && !coder.video.first_succ) {\n      doLog(\"frame_enc: encrypt: first frame encrypted type: video uid: \" +\n            userid.substring(0,8) + \" fid: \" + coder.frameId + \" csrc: \" + ssrc);\n      coder.video.first_succ = true;\n    }\n    if (!isVideo && !coder.audio.first_succ) {\n      doLog(\"frame_enc: encrypt: first frame encrypted type: audio uid: \" +\n            userid.substring(0,8) + \" fid: \" + coder.frameId + \" csrc: \" + ssrc);\n      coder.audio.first_succ = true;\n    }\n\n    coder.frameId++;\n  });\n}\n\nfunction decryptFrame(coder, rtcFrame, controller) {\n  const dataBuf = rtcFrame.data;\n  const data = new Uint8Array(dataBuf);\n\n  const t = Object.prototype.toString.call(rtcFrame);\n  const isVideo = t === '[object RTCEncodedVideoFrame]'\n\n  const frameHdr = frameHeaderDecode(data);\n\n  if (frameHdr == null) {\n    doLog('decryptFrame: failed to decode frame header');\n    return;\n  }\n\n  const meta = rtcFrame.getMetadata();\n  let ssrc = meta.synchronizationSource.toString();\n  let csrc = null;\n  if (frameHdr.csrc != \"0\") {\n     csrc = frameHdr.csrc;\n  }\n  else if (meta.contributingSources && meta.contributingSources.length > 0) {\n     csrc = meta.contributingSources[0].toString();\n  }\n  else {\n     csrc = ssrc;\n  }\n\n  if (!csrc) {\n      doLog('decryptFrame: no csrc for ssrc ' + ssrc);\n      return;\n  }\n\n  let uinfo = null;\n  if (isVideo) {\n     uinfo = coder.video.users[csrc];\n  }\n  else {\n     uinfo = coder.audio.users[csrc];\n  }\n\n  if (!uinfo) {\n      doLog('decryptFrame: no userinfo for csrc: ' + csrc);\n      return;\n  }\n \n  //console.log('frame_dec: video ' + isVideo + ' ssrc ' + ssrc + ' csrc ' + csrc + ' user ' + uinfo.userid.substring(0,8));\n\n  if (isVideo && uinfo.transp_ssrcv != ssrc) {\n      doLog(\"frame_dec: decrypt: first frame received type: video uid: \" +\n            uinfo.userid.substring(0,8) + \" fid: \" + frameHdr.frameId + \" csrc: \" + csrc);\n      uinfo.first_succ_video = false;\n\n      /* Only call videoStreamHandler for selective video */\n      if (uinfo.ssrcv != ssrc) {\n          for (const [key, u] of Object.entries(coder.video.users)) {\n              if (u.transp_ssrcv == ssrc) {\n                  postMessage({\n                      op: \"setvstream\",\n                      self: coder.self,\n                      userid: u.userid,\n                      clientid: u.clientid,\n                      ssrc: \"0\",\n                  });\n                  u.transp_ssrcv = null;\n              }\n          }\n\n          postMessage({\n              op: \"setvstream\",\n              self: coder.self,\n              userid: uinfo.userid,\n              clientid: uinfo.clientid,\n              ssrc: ssrc,\n          });\n      }\n      uinfo.transp_ssrcv = ssrc;\n  }\n\n  if (!isVideo && !uinfo.first_recv_audio) {\n    doLog(\"frame_dec: decrypt: first frame received type: audio uid: \" +\n          uinfo.userid.substring(0,8) + \" fid: \" + frameHdr.frameId + \" csrc: \" + csrc);\n    uinfo.first_recv_audio = true;\n    uinfo.first_succ_audio = false;\n  }\n  /*\n  console.log(\"coder[\" + coder.self + \"]\"\n\t+ \" len=\" + frameHdr.len\n\t+ \" kid=\"+ frameHdr.keyId\n\t+ \" fid=\" + frameHdr.frameId);\n  */\n\n  let kinfo = null;\n  for (i = 0; i < coder.keys.length; i++) {\n    if (coder.keys[i].id == frameHdr.keyId) {\n      kinfo = coder.keys[i];\n      break;\n    }\n  }\n\n  if (!kinfo) {\n    getMediaKey(coder.self, frameHdr.keyId);\n    return;\n  }\n\n  let iv = null;\n  if (isVideo) {\n    iv = xor_iv(uinfo.ivv, frameHdr.frameId, frameHdr.keyId);\n  }\n  else {\n    iv = xor_iv(uinfo.iva, frameHdr.frameId, frameHdr.keyId);\n  }\n\n  const hdr = data.subarray(0, frameHdr.len);\n  const dec = data.subarray(frameHdr.len);\n  crypto.subtle.decrypt(\n    {\n      name: \"AES-GCM\",\n      iv: iv,\n      tagLength: 128,\n      additionalData: hdr\n    },\n    kinfo.key,\n    dec\n  )\n  .then(function(decdata){\n    rtcFrame.data = decdata;\n    controller.enqueue(rtcFrame);\n    if (isVideo && !uinfo.first_succ_video) {\n      doLog(\"frame_dec: decrypt: first frame decrypted type: video uid: \" +\n            uinfo.userid.substring(0,8) + \" fid: \" + frameHdr.frameId + \" csrc: \" + csrc);\n      uinfo.first_succ_video = true;\n    }\n    if (!isVideo && !uinfo.first_succ_audio) {\n      doLog(\"frame_dec: decrypt: first frame decrypted type: audio uid: \" +\n            uinfo.userid.substring(0,8) + \" fid: \" + frameHdr.frameId + \" csrc: \" + csrc);\n      uinfo.first_succ_audio = true;\n    }\n  })\n  .catch(err => {\n     console.log(err);\n  });\n}\n\nonmessage = async (event) => {\n    const {op, self} = event.data;\n    doLog('AVS worker op=' + op + ' self=' + self);\n\n    let coder = coders[self];\n    if (!coder) {\n\tdoLog('AVS worker: no coder for self=' + self);\n    }    \n    /*\n    const {opinfo, readableStream, writableStream} = event.data;\n    const mval = opinfo.mtype === 'video' ? 1 : 0; // corresponds to enum frame_media_type\n    */\n    if (op === 'create') {\n\tconst { iva, ivv } = event.data;\n\tif (!coder) {\n\t    coder = {\n\t\tself: self,\n\t\tframeId: Math.floor(Math.random() * 4294967295),\n\t\tcurrentKey: null,\n\t\tkeys: [],\n\t\taudio: {\n\t\t    first_recv: false,\n\t\t    first_succ: false,\n\t\t    iv: iva,\n\t\t    users: {},\n\t\t},\n\t\tvideo: {\n\t\t    first_recv: false,\n\t\t    first_succ: false,\n\t\t    iv: ivv,\n\t\t    users: {},\n\t\t},\n\t    }\n\t    coders[self] = coder;\n\n\t    doLog('AVS worker: adding coder for self=' + self);\n\t}\n    }\n    else if (op === 'destroy') {\n\tcoders[self] = null;\n    }\n    else if (op === 'addUser') {\n\tif (!coder) {\n\t    doLog('addUser: no coder');\n\t    return;\n\t}\n\tconst {userInfo} = event.data;\n\n\tdoLog('addUser: adding audio ssrc: '+userInfo.ssrca);\n\tcoder.audio.users[userInfo.ssrca] = userInfo;\n\tif (userInfo.ssrcv != 0) {\n\t    coder.video.users[userInfo.ssrcv] = userInfo;\n\t}\n    }\n    else if (op === 'setupSender') {\n\tconst {readableStream, writableStream} = event.data;\n\n\tconst transformStream = new TransformStream({\n\t    transform: (frame, controller) => {encryptFrame(coder, frame, controller);},\n\t});\n\treadableStream\n          .pipeThrough(transformStream)\n            .pipeTo(writableStream);\n    }\n    else if (op === 'setupReceiver') {\n       const {readableStream, writableStream} = event.data;\n\n       if (!coder) {\n\t   doLog('setupSender: no coder for self=' + self);\n           return;\n       }\n\n       const transformStream = new TransformStream({\n\t   transform: (frame, controller) => {decryptFrame(coder, frame, controller);},\n       });\n       readableStream\n        .pipeThrough(transformStream)\n        .pipeTo(writableStream);       \n   }\n   else if (op === 'setMediaKey') {\n       const {index, current, key} = event.data;\n\n       doLog(\"setMediaKey: got key for: \" + self\n\t\t   + \" index=\" + index + \" current=\" + current\n\t\t   + \" keyLen=\" + key.length);\n\n       crypto.subtle.importKey(\n         \"raw\",\n         key,\n         \"AES-GCM\",\n         false,\n         [\"encrypt\", \"decrypt\"]\n       )\n       .then(function(k){\n         let kinfo = null;\n         for (i = 0; i < coder.keys.length; i++) {\n           if (coder.keys[i].id == index) {\n             coder.keys[i].key = k;\n             kinfo = coder.keys[i];\n             break;\n           }\n         }\n         if (!kinfo) {\n           kinfo = {id:index, key:k};\n           coder.keys.push(kinfo);\n         }\n         if (index == current)\n           coder.currentKey = kinfo;\n\n         while (coder.keys.length > 4) {\n           coder.keys.shift();\n         }\n       });\n   }    \n};\n";
 function callStreamHandler(pc, userid, clientid, ssrc) {
     if (ssrc == "0") {
         if (videoStreamHandler) {
-            pc_log(LOG_LEVEL_INFO, "calling vsh(".concat(pc.convid, ", ").concat(userid, ", ").concat(clientid, ") to remove renderer"));
+            pc_log(LOG_LEVEL_INFO, "calling vsh(".concat(pc.convid.substring(0, 8), ", ").concat(userid.substring(0, 8), ", ").concat(clientid.substring(0, 4), ") to remove renderer"));
             videoStreamHandler(pc.convid, userid, clientid, null);
         }
     }
@@ -26,7 +26,7 @@ function callStreamHandler(pc, userid, clientid, ssrc) {
             if (trans.receiver.track.label === label_1) {
                 var stream = new MediaStream([trans.receiver.track]);
                 if (videoStreamHandler) {
-                    pc_log(LOG_LEVEL_INFO, "calling vsh(".concat(pc.convid, ", ").concat(userid, ", ").concat(clientid, ") with 1 stream"));
+                    pc_log(LOG_LEVEL_INFO, "calling vsh(".concat(pc.convid.substring(0, 8), ", ").concat(userid.substring(0, 8), ", ").concat(clientid.substring(0, 4), ") with 1 stream"));
                     videoStreamHandler(pc.convid, userid, clientid, [stream]);
                 }
             }
@@ -500,16 +500,16 @@ function pc_Create(hnd, privacy, conv_type) {
     rtc.onnegotiationneeded = function () { return negotiationHandler(pc); };
     var label = '';
     rtc.ontrack = function (event) {
-        pc_log(LOG_LEVEL_INFO, "onTrack: self=".concat(pc.self, " convid=").concat(pc.convid, " userid=").concat(pc.remote_userid, "/").concat(pc.remote_clientid, " streams=").concat(event.streams.length));
+        pc_log(LOG_LEVEL_INFO, "onTrack: self=".concat(pc.self, " convid=").concat(pc.convid.substring(0, 8), " userid=").concat(pc.remote_userid.substring(0, 8), "/").concat(pc.remote_clientid.substring(0, 4), " streams=").concat(event.streams.length));
         if (event.streams && event.streams.length > 0) {
             for (var _i = 0, _a = event.streams; _i < _a.length; _i++) {
                 var stream = _a[_i];
-                pc_log(LOG_LEVEL_INFO, "onTrack: convid=".concat(pc.convid, " stream=").concat(stream));
+                pc_log(LOG_LEVEL_INFO, "onTrack: convid=".concat(pc.convid.substring(0, 8), " stream=").concat(stream));
                 for (var _b = 0, _c = stream.getTracks(); _b < _c.length; _b++) {
                     var track = _c[_b];
                     if (track) {
                         label = track.label;
-                        pc_log(LOG_LEVEL_INFO, "onTrack: convid=".concat(pc.convid, " track=").concat(track.id, "/").concat(track.label, " kind=").concat(track.kind, " enabled=").concat(track.enabled, "/").concat(track.muted, "/undefined/").concat(track.readyState, " remote=undefined"));
+                        pc_log(LOG_LEVEL_INFO, "onTrack: convid=".concat(pc.convid.substring(0, 8), " track=").concat(track.id, "/").concat(track.label, " kind=").concat(track.kind, " enabled=").concat(track.enabled, "/").concat(track.muted, "/undefined/").concat(track.readyState, " remote=undefined"));
                         if (!track.enabled)
                             track.enabled = true;
                         if (pc.conv_type === CONV_TYPE_CONFERENCE) {
@@ -525,7 +525,7 @@ function pc_Create(hnd, privacy, conv_type) {
             }
         }
         if (event.track.kind == "audio" && audioStreamHandler) {
-            pc_log(LOG_LEVEL_INFO, "onTrack: calling ash(".concat(pc.convid, ", ").concat(label, ") with ").concat(event.streams.length, " streams"));
+            pc_log(LOG_LEVEL_INFO, "onTrack: calling ash(".concat(pc.convid.substring(0, 8), ", ").concat(label, ") with ").concat(event.streams.length, " streams"));
             audioStreamHandler(pc.convid, hnd.toString() + label, event.streams);
         }
         if (event.track.kind == "video" && videoStreamHandler) {
@@ -537,7 +537,7 @@ function pc_Create(hnd, privacy, conv_type) {
                 clientid = uinfo.clientid;
             }
             if (userid != "sft" && userid != "") {
-                pc_log(LOG_LEVEL_INFO, "onTrack: calling vsh(".concat(pc.convid, ", ").concat(userid, ", ").concat(clientid, ") with ").concat(event.streams.length, " streams"));
+                pc_log(LOG_LEVEL_INFO, "onTrack: calling vsh(".concat(pc.convid.substring(0, 8), ", ").concat(userid.substring(0, 8), ", ").concat(clientid.substring(0, 4), ") with ").concat(event.streams.length, " streams"));
                 videoStreamHandler(pc.convid, userid, clientid, event.streams);
             }
         }
@@ -555,7 +555,7 @@ function pc_Close(hnd) {
             if (track && track.kind === "audio") {
                 var label = track.label;
                 if (audioStreamHandler && pc.rtc) {
-                    pc_log(LOG_LEVEL_INFO, "pc_Close: calling ash(".concat(pc.convid, ", ").concat(label, ") with 0 streams"));
+                    pc_log(LOG_LEVEL_INFO, "pc_Close: calling ash(".concat(pc.convid.substring(0, 8), ", ").concat(label, ") with 0 streams"));
                     audioStreamHandler(pc.convid, hnd.toString() + label, null);
                 }
             }
@@ -842,7 +842,7 @@ function pc_AddDecoderAnswer(hnd) {
     });
 }
 function pc_AddUserInfo(hnd, labelPtr, useridPtr, clientidPtr, ssrcaPtr, ssrcvPtr, audioIvPtr, videoIvPtr, ivlen) {
-    pc_log(LOG_LEVEL_INFO, "pc_AddUserInfo: hnd=".concat(hnd));
+    pc_log(LOG_LEVEL_INFO, "pc_AddUserInfo2: hnd=".concat(hnd));
     var pc = connectionsStore.getPeerConnection(hnd);
     if (pc == null) {
         return;
@@ -874,7 +874,7 @@ function pc_AddUserInfo(hnd, labelPtr, useridPtr, clientidPtr, ssrcaPtr, ssrcvPt
         first_succ_video: false,
         transp_ssrcv: null,
     };
-    pc_log(LOG_LEVEL_INFO, "pc_AddUserInfo: label=".concat(label, " ").concat(userId, "/").concat(clientId, " ssrc:").concat(ssrca, "/").concat(ssrcv));
+    pc_log(LOG_LEVEL_INFO, "pc_AddUserInfo: label=".concat(label, " ").concat(userId.substring(0, 8), "/").concat(clientId.substring(0, 4), " ssrc:").concat(ssrca, "/").concat(ssrcv));
     pc.users[label] = uinfo;
     worker.postMessage({
         op: 'addUser',
@@ -891,7 +891,7 @@ function pc_RemoveUserInfo(hnd, labelPtr) {
     }
     if (pc.users.hasOwnProperty(label)) {
         if (audioStreamHandler) {
-            pc_log(LOG_LEVEL_INFO, "pcRemoveUserInfo: calling ash(".concat(pc.convid, ", ").concat(label, ") with 0 streams"));
+            pc_log(LOG_LEVEL_INFO, "pcRemoveUserInfo: calling ash(".concat(pc.convid.substring(0, 8), ", ").concat(label, ") with 0 streams"));
             audioStreamHandler(pc.convid, hnd.toString() + label, null);
         }
         delete pc.users[label];

package/package.json

@@ -21,5 +21,5 @@
     "prepack": "prettier -w src/avs_wcall.ts && tsc && cp src/*.js src/*.d.ts dist/",
     "test": "karma start"
   },
-  "version": "9.3.10"
+  "version": "9.3.13"
 }