@unwanted/matrix-sdk-mini 34.12.0-1 → 34.12.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@unwanted/matrix-sdk-mini",
-    "version": "34.12.0-1",
+    "version": "34.12.0",
     "description": "Matrix Client-Server mini SDK for Javascript",
     "engines": {
         "node": ">=20.0.0"

package/src/client.ts

@@ -81,6 +81,7 @@ import {
     fixBackupKey,
     ICheckOwnCrossSigningTrustOpts,
     IRoomKeyRequestBody,
+    isCryptoAvailable,
 } from "./crypto/index.ts";
 import { DeviceInfo } from "./crypto/deviceinfo.ts";
 import { User, UserEvent, UserEventHandlerMap } from "./models/user.ts";
@@ -251,6 +252,7 @@ export type Store = IStore;
 export type ResetTimelineCallback = (roomId: string) => boolean;
 
 const SCROLLBACK_DELAY_MS = 3000;
+export const CRYPTO_ENABLED: boolean = isCryptoAvailable();
 const TURN_CHECK_INTERVAL = 10 * 60 * 1000; // poll for turn credentials every 10 minutes
 
 export const UNSTABLE_MSC3852_LAST_SEEN_UA = new UnstableValue(
@@ -2150,6 +2152,13 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
      * @deprecated libolm is deprecated. Prefer {@link initRustCrypto}.
      */
     public async initCrypto(): Promise<void> {
+        if (!isCryptoAvailable()) {
+            throw new Error(
+                `End-to-end encryption not supported in this js-sdk build: did ` +
+                    `you remember to load the olm library?`,
+            );
+        }
+
         if (this.cryptoBackend) {
             this.logger.warn("Attempt to re-initialise e2e encryption on MatrixClient");
             return;

package/src/crypto/index.ts

@@ -144,6 +144,10 @@ export const verificationMethods = {
 
 export type VerificationMethod = keyof typeof verificationMethods | string;
 
+export function isCryptoAvailable(): boolean {
+    return Boolean(globalThis.Olm);
+}
+
 // minimum time between attempting to unwedge an Olm session, if we succeeded
 // in creating a new session
 const MIN_FORCE_SESSION_INTERVAL_MS = 60 * 60 * 1000; // 1 hour