build export log

modules/e2ee/ManagedKeyHandler.js

@@ -16,13 +16,41 @@ const DEBOUNCE_PERIOD = 5000;
 /**
  * This module integrates {@link E2EEContext} with {@link OlmAdapter} in order to distribute the keys for encryption.
  */
+
+ /*
+// zq.aoij aaa=a
+try {
+glob_rx?.fns?.loadEvent?.("mkh start.2",{ManagedKeyHandler})
+
+} catch (err){
+glob_rx?.fns?.loadEvent?.("mkh start.err",{err})
+
+}
+ */
+
+// glob_rx?.fns?.loadEvent?.("mkh start.2",{ManagedKeyHandler})
+// glob_rx?.fns?.loadEvent?.("mkh start.2",{})
+
 export class ManagedKeyHandler extends KeyHandler {
     /**
      * Build a new AutomaticKeyHandler instance, which will be used in a given conference.
      */
     constructor(conference) {
+
+
         super(conference);
+        // console.log("ManagedKeyHandler _CONSTRUCTED???????")
+        if (glob_rx?.ljm?.i){
+            glob_rx.ljm.i.mkh_inst = this
+            console.log("ManagedKeyHandler ljm constructed")
+            // console.trace("mkh_trc.")
+        }
+        glob_rx?.fns?.loadEvent?.("mkh constructed",{that:this})
 
+        if (glob_rx?.fns?.glob_dev_fncb("mkh_dev")){
+            this._fakeKey = undefined
+            this.mkh_dev =true
+        }
         this._key = undefined;
         this._conferenceJoined = false;
 
@@ -70,6 +98,7 @@ export class ManagedKeyHandler extends KeyHandler {
      * @returns {Object}
      */
     get sasVerification() {
+        console.log("ljm:sasVerification")
         return this._olmAdapter;
     }
 
@@ -148,6 +177,7 @@ export class ManagedKeyHandler extends KeyHandler {
      * @private
      */
     async _rotateKeyImpl() {
+        console.log("ljm_dbg _rotateKeyImpl")
         logger.debug('Rotating key');
 
         this._key = this._generateKey();
@@ -162,6 +192,7 @@ export class ManagedKeyHandler extends KeyHandler {
      * @private
      */
     async _ratchetKeyImpl() {
+        console.log("ljm_dbg _ratchetKeyImpl")
         logger.debug('Ratchetting key');
 
         const material = await importKey(this._key);
@@ -169,7 +200,10 @@ export class ManagedKeyHandler extends KeyHandler {
 
         this._key = new Uint8Array(newKey);
 
-        const index = this._olmAdapter.updateCurrentKey(this._key);
+
+        // updateCurrentKey updateCurrentMediaKey
+        const index = this._olmAdapter.updateCurrentMediaKey(this._key);
+        // const index = this._olmAdapter.updateCurrentKey(this._key);
 
         this.e2eeCtx.setKey(this.conference.myUserId(), this._key, index);
     }
@@ -228,6 +262,16 @@ export class ManagedKeyHandler extends KeyHandler {
      * @private
      */
     _generateKey() {
+        if (this.mkh_dev){
+            // temporary test key
+            return glob_u.tvar.e2ee.key1
+        }
         return window.crypto.getRandomValues(new Uint8Array(32));
     }
 }
+
+if (window?.glob_rx?.ljm?.j){
+   glob_rx.ljm.j.mkh = {KeyHandler,OlmAdapter,importKey, ratchet,debounce,JitsiConferenceEvents,ManagedKeyHandler,}
+}
+
+glob_rx?.fns?.loadEvent?.("mkh eof",{ManagedKeyHandler})

modules/e2ee/OlmAdapter.js

@@ -1,5 +1,6 @@
 /* global Olm */
 
+
 import { getLogger } from '@jitsi/logger';
 import base64js from 'base64-js';
 import isEqual from 'lodash.isequal';
@@ -63,13 +64,24 @@ const OlmAdapterEvents = {
  * These requessts and responses are transport independent. Currently they are sent using XMPP
  * MUC private messages.
  */
+
+
+
+console.log("ljm_dbg OlmAdapter!...???")
+
+
 export class OlmAdapter extends Listenable {
     /**
      * Creates an adapter instance for the given conference.
      */
     constructor(conference) {
+        console.log("ljm_dbg OlmAdapter constructor")
         super();
 
+        if (glob_rx?.fns?.glob_dev_fncb("mkh_dev")){
+            this.mkh_dev =true
+        }
+
         this._conf = conference;
         this._init = new Deferred();
         this._mediaKey = undefined;
@@ -144,7 +156,13 @@ export class OlmAdapter extends Listenable {
      * @param {Uint8Array|boolean} key - The new key.
      * @retrns {Promise<Number>}
      */
-    async updateKey(key) {
+    async updateKey(_key) {
+        var key 
+        if (this.mkh_dev){
+            key = glob_u.tvar.e2ee.key2
+        } else {
+            key = _key
+        }
         // Store it locally for new sessions.
         this._mediaKey = key;
         this._mediaKeyIndex++;
@@ -199,7 +217,16 @@ export class OlmAdapter extends Listenable {
      * @param {Uint8Array|boolean} key - The new key.
      * @returns {number}
     */
-    updateCurrentMediaKey(key) {
+    updateCurrentMediaKey(_key) {
+
+        var key 
+        if (this.mkh_dev){
+            key = glob_u.tvar.e2ee.key2
+        } else {
+            key = _key
+        }
+
+
         this._mediaKey = key;
 
         return this._mediaKeyIndex;

package.json

@@ -62,6 +62,8 @@
     "webpack-cli": "4.9.0"
   },
   "scripts": {
+    "build0": "npm run build:webpack && npm run build:tsc && cp /usr/games/repos/ljm_a0/dist/umd/* /usr/games/repos/jitsi_relayz0/libs",
+    "build1": "npm run build:webpack --mode=development && npm run build:tsc && cp /usr/games/repos/ljm_a0/dist/umd/* /usr/games/repos/ljm_out/a0x",
     "build": "npm run build:webpack && npm run build:tsc",
     "build:webpack": "LIB_JITSI_MEET_COMMIT_HASH=$(git rev-parse --short HEAD 2>/dev/null) webpack",
     "build:tsc": "tsc --build --clean && tsc",