Tsify lib/shorteners (#4504)

* Convert lib/shorteners to ts * Improved types
compiler-explorer · Jan 24, 2023 · ce55a35 · ce55a35
1 parent 95d1d88
commit ce55a35
Show file tree

Hide file tree

Showing 8 changed files with 95 additions and 17 deletions.
diff --git a/lib/shortener/_all.js → lib/shortener/_all.ts b/lib/shortener/_all.js → lib/shortener/_all.ts
diff --git a/lib/shortener/base.js → lib/shortener/base.ts b/lib/shortener/base.js → lib/shortener/base.ts
@@ -22,11 +22,17 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-export class BaseShortener {
-    constructor(storageHandler) {
-        this.storageHandler = storageHandler;
-    }
+import * as express from 'express';
+
+import {StorageBase} from '../storage';
+
+export abstract class BaseShortener {
+    constructor(protected storageHandler: StorageBase) {}
 
     // eslint-disable-next-line no-unused-vars
-    handle(req, res) {}
+    abstract handle(req: express.Request, res: express.Response);
+
+    static get key(): string {
+        throw 'get key() must be overridden';
+    }
 }
diff --git a/lib/shortener/default.js → lib/shortener/default.ts b/lib/shortener/default.js → lib/shortener/default.ts
@@ -22,14 +22,16 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
+import * as express from 'express';
+
 import {BaseShortener} from './base';
 
 export class DefaultShortener extends BaseShortener {
-    static get key() {
-        return 'default';
+    override handle(req: express.Request, res: express.Response) {
+        return this.storageHandler.handler(req, res);
     }
 
-    handle(req, res) {
-        return this.storageHandler.handler(req, res);
+    static override get key() {
+        return 'default';
     }
 }
diff --git a/lib/shortener/google.js → lib/shortener/google.ts b/lib/shortener/google.js → lib/shortener/google.ts
@@ -25,7 +25,7 @@
 import request from 'request';
 
 export class ShortLinkResolver {
-    resolve(url) {
+    resolve(url: string) {
         return new Promise((resolve, reject) => {
             request({method: 'HEAD', uri: url, followRedirect: false}, (err, res) => {
                 if (err !== null) {

diff --git a/lib/shortener/index.js → lib/shortener/index.ts b/lib/shortener/index.js → lib/shortener/index.ts
diff --git a/lib/shortener/tinyurl.js → lib/shortener/tinyurl.ts b/lib/shortener/tinyurl.js → lib/shortener/tinyurl.ts
@@ -22,28 +22,29 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
+import * as express from 'express';
 import request from 'request';
 
 import {BaseShortener} from './base';
 
 export class TinyUrlShortener extends BaseShortener {
-    static get key() {
-        return 'tinyurl';
-    }
-
-    handle(req, res) {
+    override handle(req: express.Request, res: express.Response) {
         const url = `${req.protocol}://${req.get('host')}#${req.body.config}`;
         const options = {
             url: 'https://tinyurl.com/api-create.php?url=' + encodeURIComponent(url),
             method: 'GET',
         };
-        const callback = (err, resp, body) => {
+        const callback = (err, resp: request.Response, body) => {
             if (!err && resp.statusCode === 200) {
                 res.send({url: body});
             } else {
-                res.status(resp.statusCode).send(resp.error);
+                res.status(resp.statusCode).send('Tinyurl error');
             }
         };
         request.post(options, callback);
     }
+
+    static override get key() {
+        return 'tinyurl';
+    }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,6 +25,7 @@
     "@sentry/browser": "^6.16.1",
     "@sentry/node": "^6.16.1",
     "@types/file-saver": "^2.0.5",
+    "@types/request": "^2.48.8",
     "aws-sdk": "^2.1048.0",
     "big-integer": "^1.6.51",
     "body-parser": "^1.19.1",