@unwanted/matrix-sdk-mini 34.12.0 → 36.0.0

package/lib/randomstring.js

@@ -16,28 +16,80 @@ limitations under the License.
 */
 
 import { encodeUnpaddedBase64Url } from "./base64.js";
-var LOWERCASE = "abcdefghijklmnopqrstuvwxyz";
-var UPPERCASE = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-var DIGITS = "0123456789";
+
+/**
+ * String representing the lowercase latin alphabet for use in {@link secureRandomStringFrom}
+ * (can be combined with other such exports or other characters by appending strings)
+ */
+export var LOWERCASE = "abcdefghijklmnopqrstuvwxyz";
+
+/**
+ * String representing the uppercase latin alphabet for use in secureRandomStringFrom
+ * (can be combined with other such exports or other characters by appending strings)
+ */
+export var UPPERCASE = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+/**
+ * String representing the arabic numerals for use in secureRandomStringFrom
+ * (can be combined with other such exports or other characters by appending strings)
+ */
+export var DIGITS = "0123456789";
 export function secureRandomBase64Url(len) {
   var key = new Uint8Array(len);
   globalThis.crypto.getRandomValues(key);
   return encodeUnpaddedBase64Url(key);
 }
-export function randomString(len) {
-  return randomStringFrom(len, UPPERCASE + LOWERCASE + DIGITS);
-}
-export function randomLowercaseString(len) {
-  return randomStringFrom(len, LOWERCASE);
-}
-export function randomUppercaseString(len) {
-  return randomStringFrom(len, UPPERCASE);
+
+/**
+ * Generates a random string of uppercase and lowercase letters plus digits using a
+ * cryptographically secure random number generator.
+ * @param len The length of the string to generate
+ * @returns Random string of uppercase and lowercase letters plus digits of length `len`
+ */
+export function secureRandomString(len) {
+  return secureRandomStringFrom(len, UPPERCASE + LOWERCASE + DIGITS);
 }
-function randomStringFrom(len, chars) {
-  var ret = "";
-  for (var i = 0; i < len; ++i) {
-    ret += chars.charAt(Math.floor(Math.random() * chars.length));
+
+/**
+ * Generate a cryptographically secure random string using characters given.
+ *
+ * @param len - The length of the string to generate (must be positive and less than 32768).
+ * @param chars - The characters to use in the random string (between 2 and 256 characters long).
+ * @returns Random string of characters of length `len`.
+ */
+export function secureRandomStringFrom(len, chars) {
+  // This is intended for latin strings so 256 possibilities should be more than enough and
+  // means we can use random bytes, minimising the amount of entropy we need to ask for.
+  if (chars.length < 2 || chars.length > 256) {
+    throw new Error("Character set must be between 2 and 256 characters long");
+  }
+  if (len < 1 || len > 32768) {
+    throw new Error("Requested random string length must be between 1 and 32768");
+  }
+  // We'll generate random unsigned bytes, so get the largest number less than 256 that is a multiple
+  // of the length of the character set: We'll need to discard any random values that are larger than
+  // this as we can't possibly map them onto the character set while keeping each character equally
+  // likely to be chosen (minus 1 to convert to indices in a string). (Essentially, we're using a d8
+  // to choose between 7 possibilities and re-rolling on an 8, keeping all 7 outcomes equally likely.)
+  // Our random values must be strictly less than this
+  var randomValueCutoff = 256 - 256 % chars.length;
+  // Grab 30% more entropy than we need. This should be enough that we can discard the values that are
+  // too high without having to go back and grab more unless we're super unlucky.
+  var entropyBuffer = new Uint8Array(Math.floor(len * 1.3));
+  // Mark all of this buffer as used to start with (we haven't populated it with entropy yet) so it will
+  // be filled on the first iteration.
+  var entropyBufferPos = entropyBuffer.length;
+  var result = [];
+  while (result.length < len) {
+    if (entropyBufferPos === entropyBuffer.length) {
+      globalThis.crypto.getRandomValues(entropyBuffer);
+      entropyBufferPos = 0;
+    }
+    var randomByte = entropyBuffer[entropyBufferPos++];
+    if (randomByte < randomValueCutoff) {
+      result.push(chars[randomByte % chars.length]);
+    }
   }
-  return ret;
+  return result.join("");
 }
 //# sourceMappingURL=randomstring.js.map

package/lib/randomstring.js.map

@@ -1 +1 @@
-{"version":3,"file":"randomstring.js","names":["encodeUnpaddedBase64Url","LOWERCASE","UPPERCASE","DIGITS","secureRandomBase64Url","len","key","Uint8Array","globalThis","crypto","getRandomValues","randomString","randomStringFrom","randomLowercaseString","randomUppercaseString","chars","ret","i","charAt","Math","floor","random","length"],"sources":["../src/randomstring.ts"],"sourcesContent":["/*\nCopyright 2018 New Vector Ltd\nCopyright 2019 The Matrix.org Foundation C.I.C.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n    http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n*/\n\nimport { encodeUnpaddedBase64Url } from \"./base64.ts\";\n\nconst LOWERCASE = \"abcdefghijklmnopqrstuvwxyz\";\nconst UPPERCASE = \"ABCDEFGHIJKLMNOPQRSTUVWXYZ\";\nconst DIGITS = \"0123456789\";\n\nexport function secureRandomBase64Url(len: number): string {\n    const key = new Uint8Array(len);\n    globalThis.crypto.getRandomValues(key);\n\n    return encodeUnpaddedBase64Url(key);\n}\n\nexport function randomString(len: number): string {\n    return randomStringFrom(len, UPPERCASE + LOWERCASE + DIGITS);\n}\n\nexport function randomLowercaseString(len: number): string {\n    return randomStringFrom(len, LOWERCASE);\n}\n\nexport function randomUppercaseString(len: number): string {\n    return randomStringFrom(len, UPPERCASE);\n}\n\nfunction randomStringFrom(len: number, chars: string): string {\n    let ret = \"\";\n\n    for (let i = 0; i < len; ++i) {\n        ret += chars.charAt(Math.floor(Math.random() * chars.length));\n    }\n\n    return ret;\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,uBAAuB,QAAQ,aAAa;AAErD,IAAMC,SAAS,GAAG,4BAA4B;AAC9C,IAAMC,SAAS,GAAG,4BAA4B;AAC9C,IAAMC,MAAM,GAAG,YAAY;AAE3B,OAAO,SAASC,qBAAqBA,CAACC,GAAW,EAAU;EACvD,IAAMC,GAAG,GAAG,IAAIC,UAAU,CAACF,GAAG,CAAC;EAC/BG,UAAU,CAACC,MAAM,CAACC,eAAe,CAACJ,GAAG,CAAC;EAEtC,OAAON,uBAAuB,CAACM,GAAG,CAAC;AACvC;AAEA,OAAO,SAASK,YAAYA,CAACN,GAAW,EAAU;EAC9C,OAAOO,gBAAgB,CAACP,GAAG,EAAEH,SAAS,GAAGD,SAAS,GAAGE,MAAM,CAAC;AAChE;AAEA,OAAO,SAASU,qBAAqBA,CAACR,GAAW,EAAU;EACvD,OAAOO,gBAAgB,CAACP,GAAG,EAAEJ,SAAS,CAAC;AAC3C;AAEA,OAAO,SAASa,qBAAqBA,CAACT,GAAW,EAAU;EACvD,OAAOO,gBAAgB,CAACP,GAAG,EAAEH,SAAS,CAAC;AAC3C;AAEA,SAASU,gBAAgBA,CAACP,GAAW,EAAEU,KAAa,EAAU;EAC1D,IAAIC,GAAG,GAAG,EAAE;EAEZ,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGZ,GAAG,EAAE,EAAEY,CAAC,EAAE;IAC1BD,GAAG,IAAID,KAAK,CAACG,MAAM,CAACC,IAAI,CAACC,KAAK,CAACD,IAAI,CAACE,MAAM,CAAC,CAAC,GAAGN,KAAK,CAACO,MAAM,CAAC,CAAC;EACjE;EAEA,OAAON,GAAG;AACd","ignoreList":[]}
+{"version":3,"file":"randomstring.js","names":["encodeUnpaddedBase64Url","LOWERCASE","UPPERCASE","DIGITS","secureRandomBase64Url","len","key","Uint8Array","globalThis","crypto","getRandomValues","secureRandomString","secureRandomStringFrom","chars","length","Error","randomValueCutoff","entropyBuffer","Math","floor","entropyBufferPos","result","randomByte","push","join"],"sources":["../src/randomstring.ts"],"sourcesContent":["/*\nCopyright 2018 New Vector Ltd\nCopyright 2019 The Matrix.org Foundation C.I.C.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n    http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n*/\n\nimport { encodeUnpaddedBase64Url } from \"./base64.ts\";\n\n/**\n * String representing the lowercase latin alphabet for use in {@link secureRandomStringFrom}\n * (can be combined with other such exports or other characters by appending strings)\n */\nexport const LOWERCASE = \"abcdefghijklmnopqrstuvwxyz\";\n\n/**\n * String representing the uppercase latin alphabet for use in secureRandomStringFrom\n * (can be combined with other such exports or other characters by appending strings)\n */\nexport const UPPERCASE = \"ABCDEFGHIJKLMNOPQRSTUVWXYZ\";\n\n/**\n * String representing the arabic numerals for use in secureRandomStringFrom\n * (can be combined with other such exports or other characters by appending strings)\n */\nexport const DIGITS = \"0123456789\";\n\nexport function secureRandomBase64Url(len: number): string {\n    const key = new Uint8Array(len);\n    globalThis.crypto.getRandomValues(key);\n\n    return encodeUnpaddedBase64Url(key);\n}\n\n/**\n * Generates a random string of uppercase and lowercase letters plus digits using a\n * cryptographically secure random number generator.\n * @param len The length of the string to generate\n * @returns Random string of uppercase and lowercase letters plus digits of length `len`\n */\nexport function secureRandomString(len: number): string {\n    return secureRandomStringFrom(len, UPPERCASE + LOWERCASE + DIGITS);\n}\n\n/**\n * Generate a cryptographically secure random string using characters given.\n *\n * @param len - The length of the string to generate (must be positive and less than 32768).\n * @param chars - The characters to use in the random string (between 2 and 256 characters long).\n * @returns Random string of characters of length `len`.\n */\nexport function secureRandomStringFrom(len: number, chars: string): string {\n    // This is intended for latin strings so 256 possibilities should be more than enough and\n    // means we can use random bytes, minimising the amount of entropy we need to ask for.\n    if (chars.length < 2 || chars.length > 256) {\n        throw new Error(\"Character set must be between 2 and 256 characters long\");\n    }\n    if (len < 1 || len > 32768) {\n        throw new Error(\"Requested random string length must be between 1 and 32768\");\n    }\n    // We'll generate random unsigned bytes, so get the largest number less than 256 that is a multiple\n    // of the length of the character set: We'll need to discard any random values that are larger than\n    // this as we can't possibly map them onto the character set while keeping each character equally\n    // likely to be chosen (minus 1 to convert to indices in a string). (Essentially, we're using a d8\n    // to choose between 7 possibilities and re-rolling on an 8, keeping all 7 outcomes equally likely.)\n    // Our random values must be strictly less than this\n    const randomValueCutoff = 256 - (256 % chars.length);\n    // Grab 30% more entropy than we need. This should be enough that we can discard the values that are\n    // too high without having to go back and grab more unless we're super unlucky.\n    const entropyBuffer = new Uint8Array(Math.floor(len * 1.3));\n    // Mark all of this buffer as used to start with (we haven't populated it with entropy yet) so it will\n    // be filled on the first iteration.\n    let entropyBufferPos = entropyBuffer.length;\n    const result = [];\n    while (result.length < len) {\n        if (entropyBufferPos === entropyBuffer.length) {\n            globalThis.crypto.getRandomValues(entropyBuffer);\n            entropyBufferPos = 0;\n        }\n        const randomByte = entropyBuffer[entropyBufferPos++];\n        if (randomByte < randomValueCutoff) {\n            result.push(chars[randomByte % chars.length]);\n        }\n    }\n\n    return result.join(\"\");\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,uBAAuB,QAAQ,aAAa;;AAErD;AACA;AACA;AACA;AACA,OAAO,IAAMC,SAAS,GAAG,4BAA4B;;AAErD;AACA;AACA;AACA;AACA,OAAO,IAAMC,SAAS,GAAG,4BAA4B;;AAErD;AACA;AACA;AACA;AACA,OAAO,IAAMC,MAAM,GAAG,YAAY;AAElC,OAAO,SAASC,qBAAqBA,CAACC,GAAW,EAAU;EACvD,IAAMC,GAAG,GAAG,IAAIC,UAAU,CAACF,GAAG,CAAC;EAC/BG,UAAU,CAACC,MAAM,CAACC,eAAe,CAACJ,GAAG,CAAC;EAEtC,OAAON,uBAAuB,CAACM,GAAG,CAAC;AACvC;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASK,kBAAkBA,CAACN,GAAW,EAAU;EACpD,OAAOO,sBAAsB,CAACP,GAAG,EAAEH,SAAS,GAAGD,SAAS,GAAGE,MAAM,CAAC;AACtE;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASS,sBAAsBA,CAACP,GAAW,EAAEQ,KAAa,EAAU;EACvE;EACA;EACA,IAAIA,KAAK,CAACC,MAAM,GAAG,CAAC,IAAID,KAAK,CAACC,MAAM,GAAG,GAAG,EAAE;IACxC,MAAM,IAAIC,KAAK,CAAC,yDAAyD,CAAC;EAC9E;EACA,IAAIV,GAAG,GAAG,CAAC,IAAIA,GAAG,GAAG,KAAK,EAAE;IACxB,MAAM,IAAIU,KAAK,CAAC,4DAA4D,CAAC;EACjF;EACA;EACA;EACA;EACA;EACA;EACA;EACA,IAAMC,iBAAiB,GAAG,GAAG,GAAI,GAAG,GAAGH,KAAK,CAACC,MAAO;EACpD;EACA;EACA,IAAMG,aAAa,GAAG,IAAIV,UAAU,CAACW,IAAI,CAACC,KAAK,CAACd,GAAG,GAAG,GAAG,CAAC,CAAC;EAC3D;EACA;EACA,IAAIe,gBAAgB,GAAGH,aAAa,CAACH,MAAM;EAC3C,IAAMO,MAAM,GAAG,EAAE;EACjB,OAAOA,MAAM,CAACP,MAAM,GAAGT,GAAG,EAAE;IACxB,IAAIe,gBAAgB,KAAKH,aAAa,CAACH,MAAM,EAAE;MAC3CN,UAAU,CAACC,MAAM,CAACC,eAAe,CAACO,aAAa,CAAC;MAChDG,gBAAgB,GAAG,CAAC;IACxB;IACA,IAAME,UAAU,GAAGL,aAAa,CAACG,gBAAgB,EAAE,CAAC;IACpD,IAAIE,UAAU,GAAGN,iBAAiB,EAAE;MAChCK,MAAM,CAACE,IAAI,CAACV,KAAK,CAACS,UAAU,GAAGT,KAAK,CAACC,MAAM,CAAC,CAAC;IACjD;EACJ;EAEA,OAAOO,MAAM,CAACG,IAAI,CAAC,EAAE,CAAC;AAC1B","ignoreList":[]}

package/lib/sliding-sync-sdk.d.ts

@@ -1,6 +1,6 @@
 import { Room } from "./models/room.ts";
 import { IStoredClientOpts, MatrixClient } from "./client.ts";
-import { ISyncStateData, SyncState, SyncApiOptions, SetPresence } from "./sync.ts";
+import { ISyncStateData, SyncState, SetPresence } from "./sync.ts";
 import { MatrixEvent } from "./models/event.ts";
 import { SlidingSync } from "./sliding-sync.ts";
 /**
@@ -11,13 +11,12 @@ export declare class SlidingSyncSdk {
     private readonly slidingSync;
     private readonly client;
     private readonly opts;
-    private readonly syncOpts;
     private syncState;
     private syncStateData?;
     private lastPos;
     private failCount;
     private notifEvents;
-    constructor(slidingSync: SlidingSync, client: MatrixClient, opts?: IStoredClientOpts, syncOpts?: SyncApiOptions);
+    constructor(slidingSync: SlidingSync, client: MatrixClient, opts?: IStoredClientOpts);
     private onRoomData;
     private onLifecycle;
     /**
@@ -63,7 +62,7 @@ export declare class SlidingSyncSdk {
     /**
      * Injects events into a room's model.
      * @param stateEventList - A list of state events. This is the state
-     * at the *START* of the timeline list if it is supplied.
+     * at the *END* of the timeline list if it is supplied.
      * @param timelineEventList - A list of timeline events. Lower index
      * is earlier in time. Higher index is later.
      * @param numLive - the number of events in timelineEventList which just happened,

package/lib/sliding-sync-sdk.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sliding-sync-sdk.d.ts","sourceRoot":"","sources":["../src/sliding-sync-sdk.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAyB,IAAI,EAAa,MAAM,kBAAkB,CAAC;AAI1E,OAAO,EAAe,iBAAiB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3E,OAAO,EACH,cAAc,EACd,SAAS,EAET,cAAc,EAGd,WAAW,EACd,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIhD,OAAO,EAKH,WAAW,EAGd,MAAM,mBAAmB,CAAC;AA0S3B;;;GAGG;AACH,qBAAa,cAAc;IAUnB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAV3B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAoB;IACzC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAiB;IAC1C,OAAO,CAAC,SAAS,CAA0B;IAC3C,OAAO,CAAC,aAAa,CAAC,CAAiB;IACvC,OAAO,CAAC,OAAO,CAAuB;IACtC,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,WAAW,CAAqB;gBAGnB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,YAAY,EACrC,IAAI,CAAC,EAAE,iBAAiB,EACxB,QAAQ,CAAC,EAAE,cAAc;YAyBf,UAAU;IAYxB,OAAO,CAAC,WAAW;IAgDnB;;;OAGG;IACU,aAAa,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAI7C;;;;;;OAMG;IACU,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD;;;OAGG;IACI,WAAW,IAAI,IAAI;IAI1B;;;OAGG;IACI,WAAW,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,IAAI;IAIhD;;;OAGG;IACI,YAAY,IAAI,SAAS,GAAG,IAAI;IAIvC;;;;;;OAMG;IACI,gBAAgB,IAAI,cAAc,GAAG,IAAI;IAMzC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAwBvC,OAAO,CAAC,sBAAsB;IA8B9B,OAAO,CAAC,eAAe;YAWT,eAAe;IA6L7B;;;;;;;;OAQG;IACU,gBAAgB,CACzB,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,WAAW,EAAE,EAC7B,iBAAiB,CAAC,EAAE,WAAW,EAAE,EACjC,OAAO,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC;IA0EhB,OAAO,CAAC,cAAc;IA2Cf,gBAAgB,IAAI,OAAO;IAIlC;;OAEG;IACU,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBlC;;OAEG;IACI,IAAI,IAAI,IAAI;IAKnB;;;;OAIG;IACH,OAAO,CAAC,eAAe;IAOvB;;;;;;;OAOG;IACH,OAAO,CAAC,gBAAgB;IAaxB;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB;CAS7B"}
+{"version":3,"file":"sliding-sync-sdk.d.ts","sourceRoot":"","sources":["../src/sliding-sync-sdk.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAyB,IAAI,EAAa,MAAM,kBAAkB,CAAC;AAI1E,OAAO,EAAe,iBAAiB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3E,OAAO,EACH,cAAc,EACd,SAAS,EAGT,WAAW,EACd,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD,OAAO,EAKH,WAAW,EAGd,MAAM,mBAAmB,CAAC;AAsP3B;;;GAGG;AACH,qBAAa,cAAc;IASnB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAT3B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAoB;IACzC,OAAO,CAAC,SAAS,CAA0B;IAC3C,OAAO,CAAC,aAAa,CAAC,CAAiB;IACvC,OAAO,CAAC,OAAO,CAAuB;IACtC,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,WAAW,CAAqB;gBAGnB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,YAAY,EACrC,IAAI,CAAC,EAAE,iBAAiB;YAqBd,UAAU;IAYxB,OAAO,CAAC,WAAW;IAgDnB;;;OAGG;IACU,aAAa,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAI7C;;;;;;OAMG;IACU,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD;;;OAGG;IACI,WAAW,IAAI,IAAI;IAI1B;;;OAGG;IACI,WAAW,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,IAAI;IAIhD;;;OAGG;IACI,YAAY,IAAI,SAAS,GAAG,IAAI;IAIvC;;;;;;OAMG;IACI,gBAAgB,IAAI,cAAc,GAAG,IAAI;IAMzC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAwBvC,OAAO,CAAC,sBAAsB;IA8B9B,OAAO,CAAC,eAAe;YAWT,eAAe;IAqL7B;;;;;;;;OAQG;IACU,gBAAgB,CACzB,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,WAAW,EAAE,EAC7B,iBAAiB,GAAE,WAAW,EAAO,EACrC,OAAO,GAAE,MAAU,GACpB,OAAO,CAAC,IAAI,CAAC;IAuEhB,OAAO,CAAC,cAAc;IA2Cf,gBAAgB,IAAI,OAAO;IAIlC;;OAEG;IACU,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBlC;;OAEG;IACI,IAAI,IAAI,IAAI;IAKnB;;;;OAIG;IACH,OAAO,CAAC,eAAe;IAOvB;;;;;;;OAOG;IACH,OAAO,CAAC,gBAAgB;IAaxB;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB;CAS7B"}

package/lib/sliding-sync-sdk.js

@@ -1,5 +1,5 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 /*
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
@@ -21,7 +21,7 @@ import { logger } from "./logger.js";
 import { promiseMapSeries } from "./utils.js";
 import { EventTimeline } from "./models/event-timeline.js";
 import { ClientEvent } from "./client.js";
-import { SyncState, _createAndReEmitRoom, defaultClientOpts, defaultSyncApiOpts } from "./sync.js";
+import { SyncState, _createAndReEmitRoom, defaultClientOpts } from "./sync.js";
 import { MatrixError } from "./http-api/index.js";
 import { ExtensionState, SlidingSyncEvent, SlidingSyncState } from "./sliding-sync.js";
 import { EventType } from "./@types/event.js";
@@ -33,42 +33,9 @@ import { KnownMembership } from "./@types/membership.js";
 // to RECONNECTING. This is needed to inform the client of server issues when the
 // keepAlive is successful but the server /sync fails.
 var FAILED_SYNC_ERROR_THRESHOLD = 3;
-class ExtensionE2EE {
-  constructor(crypto) {
-    this.crypto = crypto;
-  }
-  name() {
-    return "e2ee";
-  }
-  when() {
-    return ExtensionState.PreProcess;
-  }
-  onRequest(isInitial) {
-    if (!isInitial) {
-      return undefined;
-    }
-    return {
-      enabled: true // this is sticky so only send it on the initial request
-    };
-  }
-  onResponse(data) {
-    var _this = this;
-    return _asyncToGenerator(function* () {
-      // Handle device list updates
-      if (data.device_lists) {
-        yield _this.crypto.processDeviceLists(data.device_lists);
-      }
-
-      // Handle one_time_keys_count and unused_fallback_key_types
-      yield _this.crypto.processKeyCounts(data.device_one_time_keys_count, data["device_unused_fallback_key_types"] || data["org.matrix.msc2732.device_unused_fallback_key_types"]);
-      _this.crypto.onSyncCompleted({});
-    })();
-  }
-}
 class ExtensionToDevice {
-  constructor(client, cryptoCallbacks) {
+  constructor(client) {
     this.client = client;
-    this.cryptoCallbacks = cryptoCallbacks;
     _defineProperty(this, "nextBatch", null);
   }
   name() {
@@ -88,14 +55,11 @@ class ExtensionToDevice {
     return extReq;
   }
   onResponse(data) {
-    var _this2 = this;
+    var _this = this;
     return _asyncToGenerator(function* () {
       var cancelledKeyVerificationTxns = [];
       var events = data["events"] || [];
-      if (events.length > 0 && _this2.cryptoCallbacks) {
-        events = yield _this2.cryptoCallbacks.preprocessToDeviceMessages(events);
-      }
-      events.map(_this2.client.getEventMapper()).map(toDeviceEvent => {
+      events.map(_this.client.getEventMapper()).map(toDeviceEvent => {
         // map is a cheap inline forEach
         // We want to flag m.key.verification.start events as cancelled
         // if there's an accompanying m.key.verification.cancel event, so
@@ -125,9 +89,9 @@ class ExtensionToDevice {
             toDeviceEvent.flagCancelled();
           }
         }
-        _this2.client.emit(ClientEvent.ToDeviceEvent, toDeviceEvent);
+        _this.client.emit(ClientEvent.ToDeviceEvent, toDeviceEvent);
       });
-      _this2.nextBatch = data.next_batch;
+      _this.nextBatch = data.next_batch;
     })();
   }
 }
@@ -150,21 +114,21 @@ class ExtensionAccountData {
     };
   }
   onResponse(data) {
-    var _this3 = this;
+    var _this2 = this;
     return _asyncToGenerator(function* () {
       if (data.global && data.global.length > 0) {
-        _this3.processGlobalAccountData(data.global);
+        _this2.processGlobalAccountData(data.global);
       }
       for (var roomId in data.rooms) {
-        var accountDataEvents = mapEvents(_this3.client, roomId, data.rooms[roomId]);
-        var room = _this3.client.getRoom(roomId);
+        var accountDataEvents = mapEvents(_this2.client, roomId, data.rooms[roomId]);
+        var room = _this2.client.getRoom(roomId);
         if (!room) {
           logger.warn("got account data for room but room doesn't exist on client:", roomId);
           continue;
         }
         room.addAccountData(accountDataEvents);
         accountDataEvents.forEach(e => {
-          _this3.client.emit(ClientEvent.Event, e);
+          _this2.client.emit(ClientEvent.Event, e);
         });
       }
     })();
@@ -210,13 +174,13 @@ class ExtensionTyping {
     };
   }
   onResponse(data) {
-    var _this4 = this;
+    var _this3 = this;
     return _asyncToGenerator(function* () {
       if (!(data !== null && data !== void 0 && data.rooms)) {
         return;
       }
       for (var roomId in data.rooms) {
-        processEphemeralEvents(_this4.client, roomId, [data.rooms[roomId]]);
+        processEphemeralEvents(_this3.client, roomId, [data.rooms[roomId]]);
       }
     })();
   }
@@ -240,13 +204,13 @@ class ExtensionReceipts {
     return undefined; // don't send a JSON object for subsequent requests, we don't need to.
   }
   onResponse(data) {
-    var _this5 = this;
+    var _this4 = this;
     return _asyncToGenerator(function* () {
       if (!(data !== null && data !== void 0 && data.rooms)) {
         return;
       }
       for (var roomId in data.rooms) {
-        processEphemeralEvents(_this5.client, roomId, [data.rooms[roomId]]);
+        processEphemeralEvents(_this4.client, roomId, [data.rooms[roomId]]);
       }
     })();
   }
@@ -259,43 +223,38 @@ class ExtensionReceipts {
 export class SlidingSyncSdk {
   // accumulator of sync events in the current sync response
 
-  constructor(slidingSync, client, opts, syncOpts) {
+  constructor(slidingSync, client, opts) {
     this.slidingSync = slidingSync;
     this.client = client;
     _defineProperty(this, "opts", void 0);
-    _defineProperty(this, "syncOpts", void 0);
     _defineProperty(this, "syncState", null);
     _defineProperty(this, "syncStateData", void 0);
     _defineProperty(this, "lastPos", null);
     _defineProperty(this, "failCount", 0);
     _defineProperty(this, "notifEvents", []);
     this.opts = defaultClientOpts(opts);
-    this.syncOpts = defaultSyncApiOpts(syncOpts);
     if (client.getNotifTimelineSet()) {
       client.reEmitter.reEmit(client.getNotifTimelineSet(), [RoomEvent.Timeline, RoomEvent.TimelineReset]);
     }
     this.slidingSync.on(SlidingSyncEvent.Lifecycle, this.onLifecycle.bind(this));
     this.slidingSync.on(SlidingSyncEvent.RoomData, this.onRoomData.bind(this));
-    var extensions = [new ExtensionToDevice(this.client, this.syncOpts.cryptoCallbacks), new ExtensionAccountData(this.client), new ExtensionTyping(this.client), new ExtensionReceipts(this.client)];
-    if (this.syncOpts.crypto) {
-      extensions.push(new ExtensionE2EE(this.syncOpts.crypto));
-    }
+    var extensions = [new ExtensionToDevice(this.client), new ExtensionAccountData(this.client), new ExtensionTyping(this.client), new ExtensionReceipts(this.client)];
     extensions.forEach(ext => {
       this.slidingSync.registerExtension(ext);
     });
   }
   onRoomData(roomId, roomData) {
-    var _this6 = this;
+    var _this5 = this;
     return _asyncToGenerator(function* () {
-      var room = _this6.client.store.getRoom(roomId);
+      var room = _this5.client.store.getRoom(roomId);
       if (!room) {
         if (!roomData.initial) {
           logger.debug("initial flag not set but no stored room exists for room ", roomId, roomData);
           return;
         }
-        room = _createAndReEmitRoom(_this6.client, roomId, _this6.opts);
+        room = _createAndReEmitRoom(_this5.client, roomId, _this5.opts);
       }
-      yield _this6.processRoomData(_this6.client, room, roomData);
+      yield _this5.processRoomData(_this5.client, room, roomData);
     })();
   }
   onLifecycle(state, resp, err) {
@@ -452,15 +411,15 @@ export class SlidingSyncSdk {
     return false;
   }
   processRoomData(client, room, roomData) {
-    var _this7 = this;
+    var _this6 = this;
     return _asyncToGenerator(function* () {
       roomData = ensureNameEvent(client, room.roomId, roomData);
-      var stateEvents = mapEvents(_this7.client, room.roomId, roomData.required_state);
+      var stateEvents = mapEvents(_this6.client, room.roomId, roomData.required_state);
       // Prevent events from being decrypted ahead of time
       // this helps large account to speed up faster
       // room::decryptCriticalEvent is in charge of decrypting all the events
       // required for a client to function properly
-      var timelineEvents = mapEvents(_this7.client, room.roomId, roomData.timeline, false);
+      var timelineEvents = mapEvents(_this6.client, room.roomId, roomData.timeline, false);
       var ephemeralEvents = []; // TODO this.mapSyncEventsFormat(joinObj.ephemeral);
 
       // TODO: handle threaded / beacon events
@@ -501,7 +460,7 @@ export class SlidingSyncSdk {
         timelineEvents = newEvents;
         if (oldEvents.length > 0) {
           // old events are scrollback, insert them now
-          room.addEventsToTimeline(oldEvents, true, room.getLiveTimeline(), roomData.prev_batch);
+          room.addEventsToTimeline(oldEvents, true, false, room.getLiveTimeline(), roomData.prev_batch);
         }
       }
       var encrypted = room.hasEncryptionStateEvent();
@@ -525,15 +484,15 @@ export class SlidingSyncSdk {
         room.currentState.setJoinedMemberCount(roomData.joined_count);
       }
       if (roomData.invite_state) {
-        var inviteStateEvents = mapEvents(_this7.client, room.roomId, roomData.invite_state);
-        yield _this7.injectRoomEvents(room, inviteStateEvents);
+        var inviteStateEvents = mapEvents(_this6.client, room.roomId, roomData.invite_state);
+        yield _this6.injectRoomEvents(room, inviteStateEvents);
         if (roomData.initial) {
           room.recalculate();
-          _this7.client.store.storeRoom(room);
-          _this7.client.emit(ClientEvent.Room, room);
+          _this6.client.store.storeRoom(room);
+          _this6.client.emit(ClientEvent.Room, room);
         }
         inviteStateEvents.forEach(e => {
-          _this7.client.emit(ClientEvent.Event, e);
+          _this6.client.emit(ClientEvent.Event, e);
         });
         room.updateMyMembership(KnownMembership.Invite);
         return;
@@ -592,7 +551,7 @@ export class SlidingSyncSdk {
           }
       } */
 
-      yield _this7.injectRoomEvents(room, stateEvents, timelineEvents, roomData.num_live);
+      yield _this6.injectRoomEvents(room, stateEvents, timelineEvents, roomData.num_live);
 
       // we deliberately don't add ephemeral events to the timeline
       room.addEphemeralEvents(ephemeralEvents);
@@ -608,13 +567,10 @@ export class SlidingSyncSdk {
 
       // check if any timeline events should bing and add them to the notifEvents array:
       // we'll purge this once we've fully processed the sync response
-      _this7.addNotifications(timelineEvents);
+      _this6.addNotifications(timelineEvents);
       var processRoomEvent = /*#__PURE__*/function () {
         var _ref = _asyncToGenerator(function* (e) {
           client.emit(ClientEvent.Event, e);
-          if (e.isState() && e.getType() == EventType.RoomEncryption && _this7.syncOpts.cryptoCallbacks) {
-            yield _this7.syncOpts.cryptoCallbacks.onCryptoEvent(room, e);
-          }
         });
         return function processRoomEvent(_x) {
           return _ref.apply(this, arguments);
@@ -625,30 +581,24 @@ export class SlidingSyncSdk {
       ephemeralEvents.forEach(function (e) {
         client.emit(ClientEvent.Event, e);
       });
-
-      // Decrypt only the last message in all rooms to make sure we can generate a preview
-      // And decrypt all events after the recorded read receipt to ensure an accurate
-      // notification count
-      room.decryptCriticalEvents();
     })();
   }
 
   /**
    * Injects events into a room's model.
    * @param stateEventList - A list of state events. This is the state
-   * at the *START* of the timeline list if it is supplied.
+   * at the *END* of the timeline list if it is supplied.
    * @param timelineEventList - A list of timeline events. Lower index
    * is earlier in time. Higher index is later.
    * @param numLive - the number of events in timelineEventList which just happened,
    * supplied from the server.
    */
-  injectRoomEvents(room, stateEventList, timelineEventList, numLive) {
-    var _this8 = this;
+  injectRoomEvents(room, stateEventList) {
+    var _arguments = arguments,
+      _this7 = this;
     return _asyncToGenerator(function* () {
-      timelineEventList = timelineEventList || [];
-      stateEventList = stateEventList || [];
-      numLive = numLive || 0;
-
+      var timelineEventList = _arguments.length > 2 && _arguments[2] !== undefined ? _arguments[2] : [];
+      var numLive = _arguments.length > 3 && _arguments[3] !== undefined ? _arguments[3] : 0;
       // If there are no events in the timeline yet, initialise it with
       // the given state events
       var liveTimeline = room.getLiveTimeline();
@@ -663,7 +613,7 @@ export class SlidingSyncSdk {
         // find some solution where MatrixEvents are immutable but allow for a cache
         // field.
         for (var ev of stateEventList) {
-          _this8.client.getPushActionsForEvent(ev);
+          _this7.client.getPushActionsForEvent(ev);
         }
         liveTimeline.initialiseState(stateEventList);
       }
@@ -699,22 +649,23 @@ export class SlidingSyncSdk {
         timelineEventList = timelineEventList.slice(0, -1 * liveTimelineEvents.length);
       }
 
-      // execute the timeline events. This will continue to diverge the current state
-      // if the timeline has any state events in it.
+      // Execute the timeline events.
       // This also needs to be done before running push rules on the events as they need
       // to be decorated with sender etc.
       yield room.addLiveEvents(timelineEventList, {
-        fromCache: true
+        fromCache: true,
+        addToState: false
       });
       if (liveTimelineEvents.length > 0) {
         yield room.addLiveEvents(liveTimelineEvents, {
-          fromCache: false
+          fromCache: false,
+          addToState: false
         });
       }
       room.recalculate();
 
       // resolve invites now we have set the latest state
-      _this8.resolveInvites(room);
+      _this7.resolveInvites(room);
     })();
   }
   resolveInvites(room) {
@@ -764,29 +715,29 @@ export class SlidingSyncSdk {
    * Main entry point. Blocks until stop() is called.
    */
   sync() {
-    var _this9 = this;
+    var _this8 = this;
     return _asyncToGenerator(function* () {
       logger.debug("Sliding sync init loop");
 
       //   1) We need to get push rules so we can check if events should bing as we get
       //      them from /sync.
-      while (!_this9.client.isGuest()) {
+      while (!_this8.client.isGuest()) {
         try {
           logger.debug("Getting push rules...");
-          var result = yield _this9.client.getPushRules();
+          var result = yield _this8.client.getPushRules();
           logger.debug("Got push rules");
-          _this9.client.pushRules = result;
+          _this8.client.pushRules = result;
           break;
         } catch (err) {
           logger.error("Getting push rules failed", err);
-          if (_this9.shouldAbortSync(err)) {
+          if (_this8.shouldAbortSync(err)) {
             return;
           }
         }
       }
 
       // start syncing
-      yield _this9.slidingSync.start();
+      yield _this8.slidingSync.start();
     })();
   }
 
@@ -844,7 +795,9 @@ export class SlidingSyncSdk {
     });
     this.notifEvents.forEach(event => {
       var _this$client$getNotif;
-      (_this$client$getNotif = this.client.getNotifTimelineSet()) === null || _this$client$getNotif === void 0 || _this$client$getNotif.addLiveEvent(event);
+      (_this$client$getNotif = this.client.getNotifTimelineSet()) === null || _this$client$getNotif === void 0 || _this$client$getNotif.addLiveEvent(event, {
+        addToState: false
+      });
     });
     this.notifEvents = [];
   }