Merge remote-tracking branch 'origin/develop' into j94/typescript-intent

changelog.d/188.bugfix

@@ -0,0 +1 @@
+Fix bluebird defer warnings by using our own defer implementation.

spec/integ/bridge.spec.js

@@ -19,6 +19,8 @@ var RemoteRoom = require("../..").RemoteRoom;
 var AppServiceRegistration = require("matrix-appservice").AppServiceRegistration;
 var Bridge = require("../..").Bridge;
 
+const deferPromise = require("../../lib/utils/promiseutil").defer;
+
 describe("Bridge", function() {
     var bridge, bridgeCtrl, appService, clientFactory, appServiceRegistration;
     var roomStore, userStore, clients;
@@ -80,7 +82,7 @@ describe("Bridge", function() {
         });
 
         function loadDatabase(path, Cls) {
-            var defer = Promise.defer();
+            const defer = deferPromise();
             var db = new Datastore({
                 filename: path,
                 autoload: true,

src/bridge.js

@@ -41,6 +41,7 @@ const RoomUpgradeHandler = require("./components/room-upgrade-handler");
 const EventNotHandledError = require("./errors").EventNotHandledError;
 const InternalError = require("./errors").InternalError;
 const EventQueue = require("./components/event-queue").EventQueue;
+const defer = require("./utils/promiseutil").defer;
 
 const log = require("./components/logging").get("bridge");
 
@@ -1009,7 +1010,7 @@ Bridge.prototype.requestCheckToken = function(req) {
 }
 
 function loadDatabase(path, Cls) {
-    var defer = Promise.defer();
+    const defer = defer();
     var db = new Datastore({
         filename: path,
         autoload: true,

src/components/bridge-store.js

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 const Promise = require("bluebird");
+const deferPromise = require("../utils/promiseutil").defer;
 
 // wrapper to use promises
 var callbackFn = function(d, err, result) {
@@ -42,7 +43,7 @@ function BridgeStore(db) {
  * @return {Promise}
  */
 BridgeStore.prototype.insert = function(objects, defer) {
-    defer = defer || new Promise.defer();
+    defer = defer || deferPromise();
     this.db.insert(objects, function(err, result) {
         callbackFn(defer, err, result);
     });
@@ -57,7 +58,7 @@ BridgeStore.prototype.insert = function(objects, defer) {
  * @return {Promise}
  */
 BridgeStore.prototype.upsert = function(query, updateVals, defer) {
-    defer = defer || new Promise.defer();
+    defer = defer || deferPromise();
     this.db.update(query, updateVals, {upsert: true}, function(err, result) {
         callbackFn(defer, err, result);
     });
@@ -89,7 +90,7 @@ BridgeStore.prototype.insertIfNotExists = function(query, insertObj) {
  * @return {Promise}
  */
 BridgeStore.prototype.update = function(query, updateVals, defer) {
-    defer = defer || new Promise.defer();
+    defer = defer || deferPromise();
     this.db.update(query, updateVals, {upsert: false}, function(err, result) {
         callbackFn(defer, err, result);
     });
@@ -103,7 +104,7 @@ BridgeStore.prototype.update = function(query, updateVals, defer) {
  * @return {Promise}
  */
 BridgeStore.prototype.delete = function(query, defer) {
-    defer = defer || new Promise.defer();
+    defer = defer || deferPromise();
     this.db.remove(query, {multi: true}, function(err, result) {
         callbackFn(defer, err, result);
     });
@@ -118,7 +119,7 @@ BridgeStore.prototype.delete = function(query, defer) {
  * @return {Promise}
  */
 BridgeStore.prototype.selectOne = function(query, transformFn, defer) {
-    defer = defer || new Promise.defer();
+    defer = defer || deferPromise();
     this.db.findOne(query, function(err, doc) {
         callbackFn(defer, err, transformFn ? transformFn(doc) : doc);
     });
@@ -133,7 +134,7 @@ BridgeStore.prototype.selectOne = function(query, transformFn, defer) {
  * @return {Promise}
  */
 BridgeStore.prototype.select = function(query, transformFn, defer) {
-    defer = defer || new Promise.defer();
+    defer = defer || deferPromise();
     this.db.find(query, function(err, docs) {
         callbackFn(defer, err, transformFn ? transformFn(docs) : docs);
     });

src/components/intent.ts

@@ -19,6 +19,7 @@ import JsSdk from "matrix-js-sdk";
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const { MatrixEvent, RoomMember } = JsSdk as any;
 import ClientRequestCache from "./client-request-cache";
+import { defer } from "../utils/promiseutil";
 
 type MatrixClient = {
     credentials: {
@@ -722,7 +723,7 @@ class Intent {
         FAIL (bot can't get into the room)
         */
 
-        const deferredPromise = Bluebird.defer();
+        const deferredPromise = defer();
 
         const mark = (room: string, state: MembershipState) => {
             this.opts.backingStore.setMembership(room, userId, state);

src/components/request.js

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var Promise = require("bluebird");
+const defer = require("../utils/promiseutil").defer;
 
 function generateRequestId() {
     return (Math.random() * 1e20).toString(36);
@@ -32,7 +32,7 @@ function Request(opts) {
     this.id = opts.id || generateRequestId();
     this.data = opts.data;
     this.startTs = Date.now();
-    this.defer = new Promise.defer();
+    this.defer = new defer();
 }
 
 /**

src/utils/promiseutil.ts

@@ -0,0 +1,37 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import Bluebird from "bluebird";
+
+export interface Defer<T> {
+    resolve: (value?: T) => void;
+    reject: (err?: unknown) => void;
+    promise: Bluebird<T>;
+}
+
+export function defer<T>(): Defer<T> {
+    let resolve!: (value?: T) => void;
+    let reject!: (err?: unknown) => void;
+    const promise = new Bluebird((res, rej) => {
+        resolve = res;
+        reject = rej
+    });
+    return {
+        resolve: resolve,
+        reject: reject,
+        promise: promise as Bluebird<T>
+    };
+}