v12.3.0

Prepare changelog for v12.3.0
Merge pull request #1855 from matrix-org/dbkr/update_allchange
2021-08-16 13:52:36 +01:00 · 2021-08-16 13:52:35 +01:00 · 2021-08-16 13:31:28 +01:00 · 2021-08-16 13:24:11 +01:00 · 2021-08-16 13:18:06 +01:00 · 2021-08-16 12:40:08 +01:00
7 changed files with 90 additions and 33 deletions
@@ -1,5 +1,5 @@
-Changes in [12.3.0-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v12.3.0-rc.1) (2021-07-11)
-=============================================================================================================
+Changes in [12.3.0](https://github.com/vector-im/element-desktop/releases/tag/v12.3.0) (2021-08-16)
+===================================================================================================

 ## ✨ Features
 * Support for MSC3291: Muting in VoIP calls ([\#1812](https://github.com/matrix-org/matrix-js-sdk/pull/1812)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
@@ -7,6 +7,8 @@ Changes in [12.3.0-rc.1](https://github.com/vector-im/element-desktop/releases/t
 * Handle DTMF support ([\#1813](https://github.com/matrix-org/matrix-js-sdk/pull/1813)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).

 ## 🐛 Bug Fixes
+ * [Release] Fix glare related regressions ([\#1854](https://github.com/matrix-org/matrix-js-sdk/pull/1854)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix the types in shipped package ([\#1842](https://github.com/matrix-org/matrix-js-sdk/pull/1842)). Fixes vector-im/element-web#18503 and vector-im/element-web#18503.
 * Fix error on turning off screensharing ([\#1833](https://github.com/matrix-org/matrix-js-sdk/pull/1833)). Fixes vector-im/element-web#18449. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
 * Fix blank profile in join events ([\#1837](https://github.com/matrix-org/matrix-js-sdk/pull/1837)). Fixes vector-im/element-web#18321.
 * fix TURN by fixing regression preventing multiple ICE candidates from sending. ([\#1838](https://github.com/matrix-org/matrix-js-sdk/pull/1838)).
@@ -14,7 +16,7 @@ Changes in [12.3.0-rc.1](https://github.com/vector-im/element-desktop/releases/t
 * Apply hidden char check to rawDisplayName too ([\#1816](https://github.com/matrix-org/matrix-js-sdk/pull/1816)).
 * Only clear bit 63 when we create the IV ([\#1819](https://github.com/matrix-org/matrix-js-sdk/pull/1819)).

-Changes in [12.2.0](https://github.com/vector-im/element-desktop/releases/tag/v12.2.0) (2021-07-02)
+Changes in [12.2.0](https://github.com/vector-im/element-desktop/releases/tag/v12.2.0) (2021-08-02)
 ===================================================================================================

 ## ✨ Features
@@ -1,6 +1,6 @@
 {
  "name": "matrix-js-sdk",
-  "version": "12.3.0-rc.1",
+  "version": "12.3.0",
  "description": "Matrix Client-Server SDK for Javascript",
  "scripts": {
    "prepublishOnly": "yarn build",
@@ -9,7 +9,7 @@
    "clean": "rimraf lib dist",
    "build": "yarn build:dev && yarn build:compile-browser && yarn build:minify-browser",
    "build:dev": "yarn clean && git rev-parse HEAD > git-revision.txt && yarn build:compile && yarn build:types",
-    "build:types": "tsc --emitDeclarationOnly",
+    "build:types": "tsc -p tsconfig-build.json --emitDeclarationOnly",
    "build:compile": "babel -d lib --verbose --extensions \".ts,.js\" src",
    "build:compile-browser": "mkdirp dist && browserify -d src/browser-index.js -p [ tsify -p ./tsconfig-build.json ] -t [ babelify --sourceMaps=inline --presets [ @babel/preset-env @babel/preset-typescript ] ] | exorcist dist/browser-matrix.js.map > dist/browser-matrix.js",
    "build:minify-browser": "terser dist/browser-matrix.js --compress --mangle --source-map --output dist/browser-matrix.min.js",
@@ -81,7 +81,7 @@
    "@types/request": "^2.48.5",
    "@typescript-eslint/eslint-plugin": "^4.17.0",
    "@typescript-eslint/parser": "^4.17.0",
-    "allchange": "github:matrix-org/allchange",
+    "allchange": "^1.0.0",
    "babel-jest": "^26.6.3",
    "babelify": "^10.0.0",
    "better-docs": "^2.4.0-beta.9",
@@ -535,6 +535,7 @@ export class MatrixCall extends EventEmitter {
            this.emit(CallEvent.FeedsChanged, this.feeds);
        }

+        // TODO: Find out what is going on here
        // why do we enable audio (and only audio) tracks here? -- matthew
        setTracksEnabled(stream.getAudioTracks(), true);

@@ -708,8 +709,6 @@ export class MatrixCall extends EventEmitter {
                this.getUserMediaFailed(e);
                return;
            }
-        } else if (this.localUsermediaStream) {
-            this.gotUserMediaForAnswer(this.localUsermediaStream);
        } else if (this.waitForLocalAVStream) {
            this.setState(CallState.WaitLocalMedia);
        }
@@ -721,14 +720,10 @@ export class MatrixCall extends EventEmitter {
     * @param {MatrixCall} newCall The new call.
     */
    replacedBy(newCall: MatrixCall) {
-        logger.debug(this.callId + " being replaced by " + newCall.callId);
        if (this.state === CallState.WaitLocalMedia) {
            logger.debug("Telling new call to wait for local media");
            newCall.waitForLocalAVStream = true;
-        } else if (this.state === CallState.CreateOffer) {
-            logger.debug("Handing local stream to new call");
-            newCall.gotUserMediaForAnswer(this.localUsermediaStream);
-        } else if (this.state === CallState.InviteSent) {
+        } else if ([CallState.CreateOffer, CallState.InviteSent].includes(this.state)) {
            logger.debug("Handing local stream to new call");
            newCall.gotUserMediaForAnswer(this.localUsermediaStream);
        }
@@ -1029,7 +1024,6 @@ export class MatrixCall extends EventEmitter {
        this.pushLocalFeed(stream, SDPStreamMetadataPurpose.Usermedia);
        this.setState(CallState.CreateOffer);

-        logger.info("Got local AV stream with id " + this.localUsermediaStream.id);
        logger.debug("gotUserMediaForInvite -> " + this.type);
        // Now we wait for the negotiationneeded event
    };
@@ -1087,9 +1081,6 @@ export class MatrixCall extends EventEmitter {
        }

        this.pushLocalFeed(stream, SDPStreamMetadataPurpose.Usermedia);
-
-        logger.info("Got local AV stream with id " + this.localUsermediaStream.id);
-
        this.setState(CallState.CreateAnswer);

        let myAnswer;
@@ -80,7 +80,7 @@ export class CallEventHandler {
                    continue;
                }
                try {
-                    this.handleCallEvent(e);
+                    await this.handleCallEvent(e);
                } catch (e) {
                    logger.error("Caught exception handling call event", e);
                }
@@ -100,7 +100,7 @@ export class CallEventHandler {

        if (event.isBeingDecrypted() || event.isDecryptionFailure()) {
            // add an event listener for once the event is decrypted.
-            event.once("Event.decrypted", () => {
+            event.once("Event.decrypted", async () => {
                if (!this.eventIsACall(event)) return;

                if (this.callEventBuffer.includes(event)) {
@@ -110,7 +110,7 @@ export class CallEventHandler {
                    // This one wasn't buffered so just run the event handler for it
                    // straight away
                    try {
-                        this.handleCallEvent(event);
+                        await this.handleCallEvent(event);
                    } catch (e) {
                        logger.error("Caught exception handling call event", e);
                    }
@@ -128,7 +128,7 @@ export class CallEventHandler {
        return type.startsWith("m.call.") || type.startsWith("org.matrix.call.");
    }

-    private handleCallEvent(event: MatrixEvent) {
+    private async handleCallEvent(event: MatrixEvent) {
        const content = event.getContent();
        const type = event.getType() as EventType;
        const weSentTheEvent = event.getSender() === this.client.credentials.userId;
@@ -169,7 +169,7 @@ export class CallEventHandler {
            }

            call.callId = content.call_id;
-            call.initWithInvite(event);
+            await call.initWithInvite(event);
            this.calls.set(call.callId, call);

            // if we stashed candidate events for that call ID, play them back now
@@ -201,9 +201,11 @@ export class CallEventHandler {
                // we've got an invite, pick the incoming call because we know
                // we haven't sent our invite yet otherwise, pick whichever
                // call has the lowest call ID (by string comparison)
-                if (existingCall.state === CallState.WaitLocalMedia ||
-                        existingCall.state === CallState.CreateOffer ||
-                        existingCall.callId > call.callId) {
+                if (
+                    existingCall.state === CallState.WaitLocalMedia ||
+                    existingCall.state === CallState.CreateOffer ||
+                    existingCall.callId > call.callId
+                ) {
                    logger.log(
                        "Glare detected: answering incoming call " + call.callId +
                        " and canceling outgoing call " + existingCall.callId,
@@ -1,5 +1,12 @@
 {
  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "sourceMap": true,
+    "noEmit": false,
+    "emitDecoratorMetadata": true,
+    "outDir": "./lib",
+    "rootDir": "src"
+  },
  "exclude": [
    "./spec/**/*.ts"
  ]
@@ -1,14 +1,12 @@
 {
  "compilerOptions": {
+    "target": "es2016",
    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
    "esModuleInterop": true,
    "module": "commonjs",
    "moduleResolution": "node",
-    "target": "es2016",
    "noImplicitAny": false,
-    "sourceMap": true,
-    "outDir": "./lib",
+    "noEmit": true,
    "declaration": true
  },
  "include": [
@@ -2,6 +2,28 @@
 # yarn lockfile v1


+"@actions/core@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.4.0.tgz#cf2e6ee317e314b03886adfeb20e448d50d6e524"
+  integrity sha512-CGx2ilGq5i7zSLgiiGUtBCxhRRxibJYU6Fim0Q1Wg2aQL2LTnF27zbqZOrxfvFQ55eSBW0L8uVStgtKMpa0Qlg==
+
+"@actions/github@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@actions/github/-/github-5.0.0.tgz#1754127976c50bd88b2e905f10d204d76d1472f8"
+  integrity sha512-QvE9eAAfEsS+yOOk0cylLBIO/d6WyWIOvsxxzdrPFaud39G6BOkUwScXZn1iBzQzHyu9SBkkLSWlohDWdsasAQ==
+  dependencies:
+    "@actions/http-client" "^1.0.11"
+    "@octokit/core" "^3.4.0"
+    "@octokit/plugin-paginate-rest" "^2.13.3"
+    "@octokit/plugin-rest-endpoint-methods" "^5.1.1"
+
+"@actions/http-client@^1.0.11":
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-1.0.11.tgz#c58b12e9aa8b159ee39e7dd6cbd0e91d905633c0"
+  integrity sha512-VRYHGQV1rqnROJqdMvGUbY/Kn8vriQe/F9HR2AlYHzmKuM/p3kjNuXhmdBfcVgsvRWTz5C5XW5xvndZrVBuAYg==
+  dependencies:
+    tunnel "0.0.6"
+
 "@babel/cli@^7.12.10":
  version "7.14.8"
  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.14.8.tgz#fac73c0e2328a8af9fd3560c06b096bfa3730933"
@@ -1235,7 +1257,7 @@
  dependencies:
    "@octokit/types" "^6.0.3"

-"@octokit/core@^3.5.0":
+"@octokit/core@^3.4.0", "@octokit/core@^3.5.0":
  version "3.5.1"
  resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.5.1.tgz#8601ceeb1ec0e1b1b8217b960a413ed8e947809b"
  integrity sha512-omncwpLVxMP+GLpLPgeGJBF6IWJFjXDS5flY5VbppePYX9XehevbDykRH9PdCdvqt9TS5AOTiDide7h0qrkHjw==
@@ -1271,6 +1293,18 @@
  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-9.3.0.tgz#160347858d727527901c6aae7f7d5c2414cc1f2e"
  integrity sha512-oz60hhL+mDsiOWhEwrj5aWXTOMVtQgcvP+sRzX4C3cH7WOK9QSAoEtjWh0HdOf6V3qpdgAmUMxnQPluzDWR7Fw==

+"@octokit/openapi-types@^9.5.0":
+  version "9.7.0"
+  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-9.7.0.tgz#9897cdefd629cd88af67b8dbe2e5fb19c63426b2"
+  integrity sha512-TUJ16DJU8mekne6+KVcMV5g6g/rJlrnIKn7aALG9QrNpnEipFc1xjoarh0PKaAWf2Hf+HwthRKYt+9mCm5RsRg==
+
+"@octokit/plugin-paginate-rest@^2.13.3":
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.15.1.tgz#264189dd3ce881c6c33758824aac05a4002e056a"
+  integrity sha512-47r52KkhQDkmvUKZqXzA1lKvcyJEfYh3TKAIe5+EzMeyDM3d+/s5v11i2gTk8/n6No6DPi3k5Ind6wtDbo/AEg==
+  dependencies:
+    "@octokit/types" "^6.24.0"
+
 "@octokit/plugin-paginate-rest@^2.6.2":
  version "2.15.0"
  resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.15.0.tgz#9c956c3710b2bd786eb3814eaf5a2b17392c150d"
@@ -1291,6 +1325,14 @@
    "@octokit/types" "^6.23.0"
    deprecation "^2.3.1"

+"@octokit/plugin-rest-endpoint-methods@^5.1.1":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.8.0.tgz#33b342fe41f2603fdf8b958e6652103bb3ea3f3b"
+  integrity sha512-qeLZZLotNkoq+it6F+xahydkkbnvSK0iDjlXFo3jNTB+Ss0qIbYQb9V/soKLMkgGw8Q2sHjY5YEXiA47IVPp4A==
+  dependencies:
+    "@octokit/types" "^6.25.0"
+    deprecation "^2.3.1"
+
 "@octokit/request-error@^2.0.5", "@octokit/request-error@^2.1.0":
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.1.0.tgz#9e150357831bfc788d13a4fd4b1913d60c74d677"
@@ -1329,6 +1371,13 @@
  dependencies:
    "@octokit/openapi-types" "^9.3.0"

+"@octokit/types@^6.24.0", "@octokit/types@^6.25.0":
+  version "6.25.0"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.25.0.tgz#c8e37e69dbe7ce55ed98ee63f75054e7e808bf1a"
+  integrity sha512-bNvyQKfngvAd/08COlYIN54nRgxskmejgywodizQNyiKoXmWRAjKup2/LYwm+T9V0gsKH6tuld1gM0PzmOiB4Q==
+  dependencies:
+    "@octokit/openapi-types" "^9.5.0"
+
 "@sinonjs/commons@^1.7.0":
  version "1.8.3"
  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
@@ -1673,10 +1722,13 @@ align-text@^0.1.1, align-text@^0.1.3:
    longest "^1.0.1"
    repeat-string "^1.5.2"

-"allchange@github:matrix-org/allchange":
-  version "0.0.1"
-  resolved "https://codeload.github.com/matrix-org/allchange/tar.gz/56b37b06339a3ac3fe771f3ec3d0bff798df8dab"
+allchange@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/allchange/-/allchange-1.0.0.tgz#f5177b7d97f8e97a2d059a1524db9a72d94dc6d2"
+  integrity sha512-O0VIaMIORxOaReyYEijDfKdpudJhbzzVYLdJR1aROyUgOLBEp9e5V/TDXQpjX23W90IFCSRZxsDb3exLRD05HA==
  dependencies:
+    "@actions/core" "^1.4.0"
+    "@actions/github" "^5.0.0"
    "@octokit/rest" "^18.6.7"
    cli-color "^2.0.0"
    js-yaml "^4.1.0"
@@ -7267,6 +7319,11 @@ tunnel-agent@^0.6.0:
  dependencies:
    safe-buffer "^5.0.1"

+tunnel@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
+  integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
+
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
  version "0.14.5"
  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
Author	SHA1	Message	Date
RiotRobot	10e8aff46a	v12.3.0	2021-08-16 13:52:36 +01:00
RiotRobot	81e2ea6a61	Prepare changelog for v12.3.0	2021-08-16 13:52:35 +01:00
David Baker	2594c59250	Merge pull request #1855 from matrix-org/dbkr/update_allchange Update changelog generator	2021-08-16 13:31:28 +01:00
David Baker	b56a4ee6ec	Fix dates	2021-08-16 13:24:11 +01:00
David Baker	ab524ad3b4	Update changelog generator	2021-08-16 13:18:06 +01:00
David Baker	83bf80feec	Merge pull request #1854 from SimonBrandner/release/fix/glare/18538 [Release] Fix glare related regressions	2021-08-16 12:40:08 +01:00
Šimon Brandner	b9e5417218	Await handleCallEvent() Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-16 13:30:22 +02:00
Šimon Brandner	082169a756	Fix glare Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-16 13:30:21 +02:00
Šimon Brandner	cdc87d371c	Reformat some code Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-16 13:30:21 +02:00
Šimon Brandner	f8ec3bc591	Remove weird method call If we can get localUsermediaStream gotUserMediaForAnswer() has alredy been called before Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-16 13:30:21 +02:00
Šimon Brandner	85f4651e9b	Simplifie some code Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-16 13:30:20 +02:00
Šimon Brandner	da53241c48	Remove unnecessary logs Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-16 13:30:20 +02:00
Šimon Brandner	fa265296e8	Add a comment Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-16 13:30:19 +02:00
RiotRobot	67434bc5d4	v12.3.0-rc.2	2021-08-12 15:11:35 +01:00
RiotRobot	167183775e	Prepare changelog for v12.3.0-rc.2	2021-08-12 15:11:35 +01:00
David Baker	4ce6313126	Merge pull request #1840 from matrix-org/dbkr/allchange_npm Use changelog generator from npm	2021-08-12 15:02:12 +01:00
David Baker	1298ed61b6	Merge pull request #1842 from matrix-org/dbkr/fix_types_build Fix the types in shipped package	2021-08-12 14:33:01 +01:00
David Baker	2bc1f2fe21	Apparently target matters when not emitting	2021-08-12 11:54:19 +01:00
David Baker	b392dbf6f8	Fix the types building 1829 added the spec files to 'src', presumably because they just were't type checked otherwise, but this chaqnged the implicit rootDir so the lib directory we shipped has types in src/ and spec/ which meant lib/index.d.ts was at lib/src/index.d.ts. Specify the rootDir on the build tsconfig to put it back in the right place, and also try to make the base tsconfig never emit to avoid it ever generating .d.ts files in silly places. Move all the optoins related to emitting to -build since they aren't relevant in the main one. Is this a sensible way to do this? It doesn't feel terribly elegant. Fixes https://github.com/vector-im/element-web/issues/18503 Regressed in https://github.com/matrix-org/matrix-js-sdk/pull/1829	2021-08-12 11:46:49 +01:00
David Baker	6170796ed8	Use changelog generator from npm	2021-08-11 21:50:13 +01:00