Merge branch 'callback-to-promises' into add-express-promise-router

Author: ricardo-devis-agullo

package-lock.json

@@ -48,7 +48,7 @@
   ],
   "devDependencies": {
     "@types/accept-language-parser": "1.5.2",
-    "@types/async": "3.2.8",
+    "@types/async": "3.2.9",
     "@types/colors": "1.2.1",
     "@types/cross-spawn": "6.0.2",
     "@types/errorhandler": "1.5.0",
@@ -59,24 +59,24 @@
     "@types/lodash": "4.14.176",
     "@types/morgan": "1.9.3",
     "@types/multer": "1.4.7",
-    "@types/node": "16.11.3",
+    "@types/node": "16.11.6",
     "@types/parse-author": "2.0.1",
     "@types/read": "0.0.29",
     "@types/response-time": "2.3.5",
     "@types/semver": "7.3.9",
     "@types/targz": "1.0.1",
     "@types/yargs": "17.0.4",
-    "@typescript-eslint/eslint-plugin": "5.1.0",
-    "@typescript-eslint/parser": "5.1.0",
+    "@typescript-eslint/eslint-plugin": "5.2.0",
+    "@typescript-eslint/parser": "5.2.0",
     "chai": "4.3.4",
     "chalk": "4.1.2",
-    "eslint": "8.0.1",
+    "eslint": "8.1.0",
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-prettier": "4.0.0",
     "glob": "7.2.0",
     "husky": "7.0.4",
     "injectr": "0.5.1",
-    "lint-staged": "11.2.3",
+    "lint-staged": "11.2.6",
     "minimist": "1.2.5",
     "mocha": "9.1.3",
     "node-emoji": "1.11.0",
@@ -86,7 +86,7 @@
     "semver-sort": "0.0.4",
     "simple-git": "2.47.0",
     "sinon": "11.1.2",
-    "ts-node": "10.3.1",
+    "ts-node": "10.4.0",
     "type-fest": "2.5.1",
     "typescript": "4.4.4"
   },
@@ -113,18 +113,18 @@
     "multer": "1.4.3",
     "nice-cache": "0.0.5",
     "oc-client": "4.0.1",
-    "oc-client-browser": "1.5.4",
+    "oc-client-browser": "1.5.5",
     "oc-empty-response-handler": "1.0.2",
-    "oc-get-unix-utc-timestamp": "1.0.5",
-    "oc-s3-storage-adapter": "1.1.6",
-    "oc-storage-adapters-utils": "1.0.4",
-    "oc-template-es6": "1.0.6",
-    "oc-template-es6-compiler": "1.1.13",
-    "oc-template-handlebars": "6.0.24",
-    "oc-template-handlebars-compiler": "6.2.18",
-    "oc-template-jade": "7.0.5",
-    "oc-template-jade-compiler": "7.0.6",
-    "open": "8.3.0",
+    "oc-get-unix-utc-timestamp": "1.0.6",
+    "oc-s3-storage-adapter": "1.2.0",
+    "oc-storage-adapters-utils": "1.1.0",
+    "oc-template-es6": "1.0.7",
+    "oc-template-es6-compiler": "1.2.1",
+    "oc-template-handlebars": "6.0.25",
+    "oc-template-handlebars-compiler": "6.3.1",
+    "oc-template-jade": "7.0.6",
+    "oc-template-jade-compiler": "7.1.1",
+    "open": "8.4.0",
     "parse-author": "2.0.0",
     "read": "1.0.7",
     "require-package-name": "2.0.1",

package.json

@@ -1,7 +1,7 @@
 import fs from 'fs-extra';
 import path from 'path';
 
-import { getFileInfo } from 'oc-storage-adapters-utils';
+import storageUtils from 'oc-storage-adapters-utils';
 import { Request, Response } from 'express';
 import { Repository } from '../../types';
 
@@ -57,7 +57,7 @@ export default function staticRedirector(repository: Repository) {
     }
 
     const fileStream = fs.createReadStream(filePath);
-    const fileInfo = getFileInfo(filePath);
+    const fileInfo = storageUtils.getFileInfo(filePath);
 
     if (fileInfo.mimeType) {
       res.set('Content-Type', fileInfo.mimeType);

src/registry/routes/static-redirector.ts

@@ -3,19 +3,22 @@
 const expect = require('chai').expect;
 const oc = require('../../dist/index');
 const path = require('path');
-const request = require('minimal-request');
+const got = require('got');
 
 describe('registry (ui interface)', () => {
   let registry;
   let result;
   let error;
   let headers;
 
-  const next = done => (e, r, d) => {
-    error = e;
-    result = r;
-    headers = d.response.headers;
-    done();
+  const next = (promise, done) => {
+    promise
+      .then(r => {
+        headers = r.headers;
+        result = r.body;
+      })
+      .catch(e => (error = e))
+      .finally(done);
   };
 
   const conf = {
@@ -40,17 +43,16 @@ describe('registry (ui interface)', () => {
 
   describe('GET / with Accept: text/html', () => {
     before(done => {
-      request(
-        {
-          url: 'http://localhost:3030',
+      next(
+        got('http://localhost:3030', {
           headers: { accept: 'text/html' }
-        },
-        next(done)
+        }),
+        done
       );
     });
 
     it('should not error', () => {
-      expect(error).to.be.null;
+      expect(error).to.be.undefined;
     });
 
     it('should respond with html result', () => {
@@ -61,17 +63,16 @@ describe('registry (ui interface)', () => {
 
   describe('GET /oc-client/~info with Accept: text/html', () => {
     before(done => {
-      request(
-        {
-          url: 'http://localhost:3030/oc-client/~info',
+      next(
+        got('http://localhost:3030/oc-client/~info', {
           headers: { accept: 'text/html' }
-        },
-        next(done)
+        }),
+        done
       );
     });
 
     it('should not error', () => {
-      expect(error).to.be.null;
+      expect(error).to.be.undefined;
     });
 
     it('should respond with html result', () => {