@unwanted/matrix-sdk-mini 34.12.0-5 → 34.12.0-7

package/package.json

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

package/src/autodiscovery.ts

@@ -17,7 +17,7 @@ limitations under the License.
 
 import { IClientWellKnown, IWellKnownConfig, IServerVersions } from "./client.ts";
 import { logger } from "./logger.ts";
-import { MatrixError, Method, timeoutSignal } from "./http-api/index.ts";
+import { MatrixError, Method, timeoutSignal, VersionsPrefix } from "./http-api/index.ts";
 import { SUPPORTED_MATRIX_VERSIONS } from "./version-support.ts";
 
 // Dev note: Auto discovery is part of the spec.
@@ -179,7 +179,7 @@ export class AutoDiscovery {
         }
 
         // Step 3: Make sure the homeserver URL points to a homeserver.
-        const hsVersions = await this.fetchWellKnownObject<IServerVersions>(`${hsUrl}/_matrix/client/versions`);
+        const hsVersions = await this.fetchWellKnownObject<IServerVersions>(`${hsUrl}${VersionsPrefix}`);
         if (!hsVersions || !Array.isArray(hsVersions.raw?.["versions"])) {
             logger.error("Invalid /versions response");
             clientConfig["m.homeserver"].error = AutoDiscovery.ERROR_INVALID_HOMESERVER;
@@ -244,7 +244,7 @@ export class AutoDiscovery {
 
             // Step 5b: Verify there is an identity server listening on the provided
             // URL.
-            const isResponse = await this.fetchWellKnownObject(`${isUrl}/_matrix/identity/v2`);
+            const isResponse = await this.fetchWellKnownObject(`${isUrl}/im/_matrix/identity/v2`);
             if (!isResponse?.raw || isResponse.action !== AutoDiscoveryAction.SUCCESS) {
                 logger.error("Invalid /v2 response");
                 failingClientConfig["m.identity_server"].error = AutoDiscovery.ERROR_INVALID_IDENTITY_SERVER;

package/src/client.ts

@@ -60,6 +60,7 @@ import {
     Upload,
     UploadOpts,
     UploadResponse,
+    VersionsPrefix,
 } from "./http-api/index.ts";
 import { User, UserEvent, UserEventHandlerMap } from "./models/user.ts";
 import { getHttpUriForMxc } from "./content-repo.ts";
@@ -1693,7 +1694,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
         });
         const options =
             msc3391DeleteAccountDataServerSupport === ServerSupport.Unstable
-                ? { prefix: "/_matrix/client/unstable/org.matrix.msc3391" }
+                ? { prefix: "/im/_matrix/client/unstable/org.matrix.msc3391" }
                 : undefined;
         return await this.http.authedRequest(Method.Delete, path, undefined, undefined, options);
     }
@@ -3899,7 +3900,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
             prefix:
                 Thread.hasServerSideListSupport === FeatureSupport.Stable
                     ? ClientPrefix.V1
-                    : "/_matrix/client/unstable/org.matrix.msc3856",
+                    : "/im/_matrix/client/unstable/org.matrix.msc3856",
         };
 
         return this.http
@@ -5019,7 +5020,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
 
         // We send an authenticated request as of MSC4026
         this.serverVersionsPromise = this.http
-            .authedRequest<IServerVersions>(Method.Get, "/_matrix/client/versions", undefined, undefined, {
+            .authedRequest<IServerVersions>(Method.Get, VersionsPrefix, undefined, undefined, {
                 prefix: "",
             })
             .catch((e) => {
@@ -5218,7 +5219,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
             case SERVICE_TYPES.IS:
                 return this.http.getUrl("/terms", undefined, IdentityPrefix.V2, baseUrl);
             case SERVICE_TYPES.IM:
-                return this.http.getUrl("/terms", undefined, "/_matrix/integrations/v1", baseUrl);
+                return this.http.getUrl("/terms", undefined, "/im/_matrix/integrations/v1", baseUrl);
             default:
                 throw new Error("Unsupported service type");
         }
@@ -6055,7 +6056,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
         if (await this.doesServerSupportUnstableFeature("uk.tcpip.msc4133.stable")) {
             return ClientPrefix.V3;
         }
-        return "/_matrix/client/unstable/uk.tcpip.msc4133";
+        return "/im/_matrix/client/unstable/uk.tcpip.msc4133";
     }
 
     /**
@@ -7174,7 +7175,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
                 if (e.errcode === "M_UNRECOGNIZED") {
                     // fall back to the prefixed hierarchy API.
                     return this.http.authedRequest<IRoomHierarchy>(Method.Get, path, queryParams, undefined, {
-                        prefix: "/_matrix/client/unstable/org.matrix.msc2946",
+                        prefix: "/im/_matrix/client/unstable/org.matrix.msc2946",
                     });
                 }
 
@@ -7268,7 +7269,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
         const clientTimeout = req.clientTimeout;
         delete req.clientTimeout;
         return this.http.authedRequest<MSC3575SlidingSyncResponse>(Method.Post, "/sync", qps, req, {
-            prefix: "/_matrix/client/unstable/org.matrix.msc3575",
+            prefix: "/im/_matrix/client/unstable/org.matrix.msc3575",
             baseUrl: proxyBaseUrl,
             localTimeoutMs: clientTimeout,
             abortSignal,
@@ -7300,7 +7301,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
      */
     public async getRoomSummary(roomIdOrAlias: string, via?: string[]): Promise<RoomSummary> {
         const paramOpts = {
-            prefix: "/_matrix/client/unstable/im.nheko.summary",
+            prefix: "/im/_matrix/client/unstable/im.nheko.summary",
         };
         try {
             const path = utils.encodeUri("/summary/$roomid", { $roomid: roomIdOrAlias });
@@ -7402,7 +7403,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
                     (<MatrixError>err).httpStatus === 405)
             ) {
                 return await this.http.authedRequest(Method.Get, path, queryParams, undefined, {
-                    prefix: "/_matrix/client/unstable/org.matrix.msc3030",
+                    prefix: "/im/_matrix/client/unstable/org.matrix.msc3030",
                 });
             }
 

package/src/content-repo.ts

@@ -91,9 +91,9 @@ export function getHttpUriForMxc(
     const isThumbnailRequest = !!width || !!height || !!resizeMethod;
     const verb = isThumbnailRequest ? "thumbnail" : "download";
     if (useAuthentication) {
-        prefix = `/_matrix/client/v1/media/${verb}`;
+        prefix = `/im/_matrix/client/v1/media/${verb}`;
     } else {
-        prefix = `/_matrix/media/v3/${verb}`;
+        prefix = `/im/_matrix/media/v3/${verb}`;
     }
 
     const url = new URL(`${prefix}/${serverName}/${mediaId}`, baseUrl);

package/src/http-api/prefix.ts

@@ -46,3 +46,5 @@ export enum MediaPrefix {
      */
     V3 = "/im/_matrix/media/v3",
 }
+
+export const VersionsPrefix = "/im/_matrix/client/versions";

package/src/sync.ts

@@ -48,7 +48,7 @@ import {
     IToDeviceEvent,
 } from "./sync-accumulator.ts";
 import { MatrixEvent } from "./models/event.ts";
-import { MatrixError, Method } from "./http-api/index.ts";
+import { MatrixError, Method, VersionsPrefix } from "./http-api/index.ts";
 import { ISavedSync } from "./store/index.ts";
 import { EventType } from "./@types/event.ts";
 import { IPushRules } from "./@types/PushRules.ts";
@@ -1508,7 +1508,7 @@ export class SyncApi {
         this.client.http
             .request(
                 Method.Get,
-                "/_matrix/client/versions",
+                VersionsPrefix,
                 undefined, // queryParams
                 undefined, // data
                 {