Merge pull request #931 from matrix-org/bs/ts-3.7

Typescript 3.7

changelog.d/931.misc

@@ -0,0 +1 @@
+Use Typescript 3.7 and fix build issues.

package.json

@@ -48,21 +48,21 @@
     "@sentry/node": "^5.9.0"
   },
   "devDependencies": {
+    "@types/bluebird": "^3.5.27",
     "@types/express": "^4.17.2",
     "@types/extend": "^3.0.1",
-    "@types/bluebird": "^3.5.27",
     "@types/he": "^1.1.0",
     "@types/nedb": "^1.8.9",
     "@types/nopt": "^3.0.29",
     "@types/pg": "^7.11.1",
     "@types/sanitize-html": "^1.20.2",
-    "@typescript-eslint/eslint-plugin": "^2.2.0",
-    "@typescript-eslint/parser": "^2.2.0",
+    "@typescript-eslint/eslint-plugin": "^2.14.0",
+    "@typescript-eslint/parser": "^2.14.0",
     "eslint": "^5.16.0",
     "jasmine": "^3.1.0",
     "nyc": "^14.1.1",
+    "prom-client": "^11.5.3",
     "proxyquire": "^1.4.0",
-    "typescript": "^3.6.3",
-    "prom-client": "^11.5.3"
+    "typescript": "^3.7.3"
   }
 }

src/bridge/AdminRoomHandler.ts

@@ -268,7 +268,7 @@ export class AdminRoomHandler {
         });
         for (const r of matrixRooms) {
             const userMustJoin = (
-                key || server.shouldSyncMembershipToIrc("incremental", r.getId())
+                key ?? server.shouldSyncMembershipToIrc("incremental", r.getId())
             );
             if (!userMustJoin) {
                 continue;
@@ -283,7 +283,7 @@ export class AdminRoomHandler {
         for (let i = 0; i < matrixRooms.length; i++) {
             const m = matrixRooms[i];
             const userMustJoin = (
-                key || server.shouldSyncMembershipToIrc("incremental", m.getId())
+                key ?? server.shouldSyncMembershipToIrc("incremental", m.getId())
             );
             if (userMustJoin) {
                 // force join then break out (we only ever join once no matter how many

src/bridge/IrcBridge.ts

@@ -80,7 +80,7 @@ export class IrcBridge {
             });
         }
         // Dependency graph
-        this.matrixHandler = new MatrixHandler(this, this.config.matrixHandler);
+        this.matrixHandler = new MatrixHandler(this, this.config.matrixHandler || {});
         if (!this.config.database && this.config.ircService.databaseUri) {
             log.warn("ircService.databaseUri is a deprecated config option." +
                      "Please use the database configuration block");

src/bridge/MatrixHandler.ts

@@ -89,9 +89,7 @@ export class MatrixHandler {
         // maintain a list of room IDs which are being processed invite-wise. This is
         // required because invites are processed asyncly, so you could get invite->msg
         // and the message is processed before the room is created.
-        config = config || {}
-        this.eventCacheMaxSize = config.eventCacheSize === undefined ?
-            DEFAULT_EVENT_CACHE_SIZE : config.eventCacheSize;
+        this.eventCacheMaxSize = config.eventCacheSize ?? DEFAULT_EVENT_CACHE_SIZE;
         // The media URL to use to transform mxc:// URLs when handling m.room.[file|image]s
         this.mediaUrl = ircBridge.config.homeserver.media_url || ircBridge.config.homeserver.url;
         this.adminHandler = new AdminRoomHandler(ircBridge, this);

src/irc/ClientPool.ts

@@ -348,7 +348,7 @@ export class ClientPool {
             return undefined;
         }
         const cli = this.virtualClients[server.domain].nicks[nick];
-        if (!cli || cli.isDead()) {
+        if (cli?.isDead()) {
             return undefined;
         }
         return cli;

src/irc/ConnectionInstance.ts

@@ -149,7 +149,7 @@ export class ConnectionInstance {
 
         return new Bluebird((resolve) => {
             // close the connection
-            this.client.disconnect(ircReason, () => {});
+            this.client.disconnect(ircReason, () => { /* This is needed for tests */ });
             // remove timers
             if (this.pingRateTimerId) {
                 clearTimeout(this.pingRateTimerId);

src/main.ts

@@ -22,8 +22,16 @@ const log = logging.get("main");
 http.globalAgent.maxSockets = 1000;
 https.globalAgent.maxSockets = 1000;
 
-process.on("unhandledRejection", (reason?: Error) => {
-    log.error((reason ? reason.stack : undefined) || "No reason given");
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+process.on("unhandledRejection", (reason: any) => {
+    let reasonStr = "No reason given";
+    if (reason && reason.stack) {
+        reasonStr = reason.stack
+    }
+    else if (typeof(reason) === "string") {
+        reasonStr = reason;
+    }
+    log.error(reasonStr);
 });
 
 const _toServer = (domain: string, serverConfig: any, homeserverDomain: string) => {

src/models/IrcAction.ts

@@ -43,7 +43,7 @@ export class IrcAction {
                 }
                 if (matrixAction.htmlText) {
                     const text = ircFormatting.htmlToIrc(matrixAction.htmlText);
-                    const ircText = text !== null ? text : matrixAction.text; // fallback if needed.
+                    const ircText = text ?? matrixAction.text; // fallback if needed.
                     if (ircText === null) {
                         throw Error("ircText is null");
                     }

src/scripts/migrate-db-to-pgres.ts

@@ -245,8 +245,6 @@ async function main() {
     log.info("Finished migration at %sms", Date.now() - time);
 }
 
-main().then(() => {
-
-}).catch((ex) => {
+main().catch((ex) => {
     log.error("Failed to run migration script: %s", ex);
 })

tsconfig.json

@@ -11,6 +11,7 @@
     "composite": false,
     "strict": true,
     "esModuleInterop": true,
+    "strictNullChecks": true,
     "typeRoots": [
       "./types"
     ]