@verdaccio/api 6.0.0-6-next.14 → 6.0.0-6-next.15

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @verdaccio/api
 
+## 6.0.0-6-next.15
+
+### Patch Changes
+
+- Updated dependencies [2c594910]
+  - @verdaccio/logger@6.0.0-6-next.5
+  - @verdaccio/auth@6.0.0-6-next.12
+  - @verdaccio/hooks@6.0.0-6-next.7
+  - @verdaccio/middleware@6.0.0-6-next.12
+  - @verdaccio/store@6.0.0-6-next.13
+
 ## 6.0.0-6-next.14
 
 ### Major Changes

package/build/v1/search.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = _default;
 
-var _stream = require("stream");
-
 var _lodash = _interopRequireDefault(require("lodash"));
 
 var _debug = _interopRequireDefault(require("debug"));
@@ -18,115 +16,6 @@ var _commonsApi = require("@verdaccio/commons-api");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const debug = (0, _debug.default)('verdaccio:api:search');
-
-// const personMatch = (person, search) => {
-//   if (typeof person === 'string') {
-//     return person.includes(search);
-//   }
-//   if (typeof person === 'object') {
-//     for (const field of Object.values(person)) {
-//       if (typeof field === 'string' && field.includes(search)) {
-//         return true;
-//       }
-//     }
-//   }
-//   return false;
-// };
-// const matcher = function (query) {
-//   const match = query.match(/author:(.*)/);
-//   if (match !== null) {
-//     return function (pkg) {
-//       return personMatch(pkg.author, match[1]);
-//     };
-//   }
-//   // TODO: maintainer, keywords, boost-exact
-//   // TODO implement some scoring system for freetext
-//   return (pkg) => {
-//     return ['name', 'displayName', 'description']
-//       .map((k) => {
-//         return pkg[k];
-//       })
-//       .filter((x) => {
-//         return x !== undefined;
-//       })
-//       .some((txt) => {
-//         return txt.includes(query);
-//       });
-//   };
-// };
-function removeDuplicates(results) {
-  const pkgNames = [];
-  return results.filter(pkg => {
-    var _pkg$package, _pkg$package2;
-
-    if (pkgNames.includes(pkg === null || pkg === void 0 ? void 0 : (_pkg$package = pkg.package) === null || _pkg$package === void 0 ? void 0 : _pkg$package.name)) {
-      return false;
-    }
-
-    pkgNames.push(pkg === null || pkg === void 0 ? void 0 : (_pkg$package2 = pkg.package) === null || _pkg$package2 === void 0 ? void 0 : _pkg$package2.name);
-    return true;
-  });
-}
-
-function checkAccess(pkg, auth, remoteUser) {
-  return new Promise((resolve, reject) => {
-    var _pkg$package3;
-
-    auth.allow_access({
-      packageName: pkg === null || pkg === void 0 ? void 0 : (_pkg$package3 = pkg.package) === null || _pkg$package3 === void 0 ? void 0 : _pkg$package3.name
-    }, remoteUser, function (err, allowed) {
-      if (err) {
-        if (err.status && String(err.status).match(/^4\d\d$/)) {
-          // auth plugin returns 4xx user error,
-          // that's equivalent of !allowed basically
-          allowed = false;
-          return resolve(null);
-        } else {
-          reject(err);
-        }
-      } else {
-        return resolve(allowed ? pkg : null);
-      }
-    });
-  });
-}
-
-class TransFormResults extends _stream.Transform {
-  constructor(options) {
-    super(options);
-  }
-  /**
-   * Transform either array of packages or a single package into a stream of packages.
-   * From uplinks the chunks are array but from local packages are objects.
-   * @param {string} chunk
-   * @param {string} encoding
-   * @param {function} done
-   * @returns {void}
-   * @override
-   */
-
-
-  _transform(chunk, _encoding, callback) {
-    if (_lodash.default.isArray(chunk)) {
-      chunk.filter(pkgItem => {
-        var _pkgItem$package;
-
-        debug(`streaming remote pkg name ${pkgItem === null || pkgItem === void 0 ? void 0 : (_pkgItem$package = pkgItem.package) === null || _pkgItem$package === void 0 ? void 0 : _pkgItem$package.name}`);
-        return true;
-      }).forEach(pkgItem => {
-        this.push(pkgItem);
-      });
-      return callback();
-    } else {
-      var _chunk$package;
-
-      debug(`streaming local pkg name ${chunk === null || chunk === void 0 ? void 0 : (_chunk$package = chunk.package) === null || _chunk$package === void 0 ? void 0 : _chunk$package.name}`);
-      this.push(chunk);
-      return callback();
-    }
-  }
-
-}
 /**
  * Endpoint for npm search v1
  * Empty value
@@ -134,41 +23,45 @@ class TransFormResults extends _stream.Transform {
  * req: 'GET /-/v1/search?text=react&size=20&frpom=0&quality=0.65&popularity=0.98&maintenance=0.5'
  */
 
-
 function _default(route, auth, storage) {
-  route.get('/-/v1/search', async (req, res, next) => {
-    var _storage$searchManage;
+  function checkAccess(pkg, auth, remoteUser) {
+    return new Promise((resolve, reject) => {
+      var _pkg$package;
+
+      auth.allow_access({
+        packageName: pkg === null || pkg === void 0 ? void 0 : (_pkg$package = pkg.package) === null || _pkg$package === void 0 ? void 0 : _pkg$package.name
+      }, remoteUser, function (err, allowed) {
+        if (err) {
+          if (err.status && String(err.status).match(/^4\d\d$/)) {
+            // auth plugin returns 4xx user error,
+            // that's equivalent of !allowed basically
+            allowed = false;
+            return resolve(null);
+          } else {
+            reject(err);
+          }
+        } else {
+          return resolve(allowed ? pkg : null);
+        }
+      });
+    });
+  }
 
+  route.get('/-/v1/search', async (req, res, next) => {
     let [size, from] = ['size', 'from'].map(k => req.query[k]);
+    let data;
     size = parseInt(size, 10) || 20;
     from = parseInt(from, 10) || 0;
-    const data = [];
-    const transformResults = new TransFormResults({
-      objectMode: true
-    });
-    const streamPassThrough = new _stream.PassThrough({
-      objectMode: true
-    });
-    (_storage$searchManage = storage.searchManager) === null || _storage$searchManage === void 0 ? void 0 : _storage$searchManage.search(streamPassThrough, {
-      query: req.query,
-      url: req.url
-    });
-    const outPutStream = new _stream.PassThrough({
-      objectMode: true
-    });
-    (0, _stream.pipeline)(streamPassThrough, transformResults, outPutStream, err => {
-      if (err) {
-        next((0, _commonsApi.getInternalError)(err ? err.message : 'unknown error'));
-      } else {
-        debug('Pipeline succeeded.');
-      }
-    });
-    outPutStream.on('data', chunk => {
-      data.push(chunk);
-    });
-    outPutStream.on('finish', async () => {
+
+    try {
+      var _storage$searchManage;
+
+      data = await ((_storage$searchManage = storage.searchManager) === null || _storage$searchManage === void 0 ? void 0 : _storage$searchManage.search({
+        query: req.query,
+        url: req.url
+      }));
       debug('stream finish');
-      const checkAccessPromises = await Promise.all(removeDuplicates(data).map(pkgItem => {
+      const checkAccessPromises = await Promise.all(data.map(pkgItem => {
         return checkAccess(pkgItem, auth, req.remote_user);
       }));
       const final = checkAccessPromises.filter(i => !_lodash.default.isNull(i)).slice(from, size);
@@ -181,7 +74,14 @@ function _default(route, auth, storage) {
         time: new Date().toUTCString()
       };
       res.status(_commonsApi.HTTP_STATUS.OK).json(response);
-    });
+    } catch (error) {
+      _logger.logger.error({
+        error
+      }, 'search endpoint has failed @{error.message}');
+
+      next(next);
+      return;
+    }
   });
 }
 //# sourceMappingURL=search.js.map

package/build/v1/search.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/v1/search.ts"],"names":["debug","removeDuplicates","results","pkgNames","filter","pkg","includes","package","name","push","checkAccess","auth","remoteUser","Promise","resolve","reject","allow_access","packageName","err","allowed","status","String","match","TransFormResults","Transform","constructor","options","_transform","chunk","_encoding","callback","_","isArray","pkgItem","forEach","route","storage","get","req","res","next","size","from","map","k","query","parseInt","data","transformResults","objectMode","streamPassThrough","PassThrough","searchManager","search","url","outPutStream","message","on","checkAccessPromises","all","remote_user","final","i","isNull","slice","logger","length","response","objects","total","time","Date","toUTCString","HTTP_STATUS","OK","json"],"mappings":"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","sourcesContent":["import { Transform, pipeline, PassThrough } from 'stream';\nimport _ from 'lodash';\nimport buildDebug from 'debug';\nimport { Package } from '@verdaccio/types';\nimport { logger } from '@verdaccio/logger';\nimport { IAuth } from '@verdaccio/auth';\nimport { searchUtils } from '@verdaccio/core';\nimport { HTTP_STATUS, getInternalError } from '@verdaccio/commons-api';\nimport { Storage } from '@verdaccio/store';\n\nconst debug = buildDebug('verdaccio:api:search');\n\ntype SearchResults = {\n  objects: searchUtils.SearchItemPkg[];\n  total: number;\n  time: string;\n};\n\n// const personMatch = (person, search) => {\n//   if (typeof person === 'string') {\n//     return person.includes(search);\n//   }\n\n//   if (typeof person === 'object') {\n//     for (const field of Object.values(person)) {\n//       if (typeof field === 'string' && field.includes(search)) {\n//         return true;\n//       }\n//     }\n//   }\n\n//   return false;\n// };\n\n// const matcher = function (query) {\n//   const match = query.match(/author:(.*)/);\n//   if (match !== null) {\n//     return function (pkg) {\n//       return personMatch(pkg.author, match[1]);\n//     };\n//   }\n\n//   // TODO: maintainer, keywords, boost-exact\n//   // TODO implement some scoring system for freetext\n//   return (pkg) => {\n//     return ['name', 'displayName', 'description']\n//       .map((k) => {\n//         return pkg[k];\n//       })\n//       .filter((x) => {\n//         return x !== undefined;\n//       })\n//       .some((txt) => {\n//         return txt.includes(query);\n//       });\n//   };\n// };\n\nfunction removeDuplicates(results) {\n  const pkgNames: any[] = [];\n  return results.filter((pkg) => {\n    if (pkgNames.includes(pkg?.package?.name)) {\n      return false;\n    }\n    pkgNames.push(pkg?.package?.name);\n    return true;\n  });\n}\n\nfunction checkAccess(pkg: any, auth: any, remoteUser): Promise<Package | null> {\n  return new Promise((resolve, reject) => {\n    auth.allow_access({ packageName: pkg?.package?.name }, remoteUser, function (err, allowed) {\n      if (err) {\n        if (err.status && String(err.status).match(/^4\\d\\d$/)) {\n          // auth plugin returns 4xx user error,\n          // that's equivalent of !allowed basically\n          allowed = false;\n          return resolve(null);\n        } else {\n          reject(err);\n        }\n      } else {\n        return resolve(allowed ? pkg : null);\n      }\n    });\n  });\n}\n\nclass TransFormResults extends Transform {\n  public constructor(options) {\n    super(options);\n  }\n\n  /**\n   * Transform either array of packages or a single package into a stream of packages.\n   * From uplinks the chunks are array but from local packages are objects.\n   * @param {string} chunk\n   * @param {string} encoding\n   * @param {function} done\n   * @returns {void}\n   * @override\n   */\n  public _transform(chunk, _encoding, callback) {\n    if (_.isArray(chunk)) {\n      (chunk as searchUtils.SearchItem[])\n        .filter((pkgItem) => {\n          debug(`streaming remote pkg name ${pkgItem?.package?.name}`);\n          return true;\n        })\n        .forEach((pkgItem) => {\n          this.push(pkgItem);\n        });\n      return callback();\n    } else {\n      debug(`streaming local pkg name ${chunk?.package?.name}`);\n      this.push(chunk);\n      return callback();\n    }\n  }\n}\n\n/**\n * Endpoint for npm search v1\n * Empty value\n *  - {\"objects\":[],\"total\":0,\"time\":\"Sun Jul 25 2021 14:09:11 GMT+0000 (Coordinated Universal Time)\"}\n * req: 'GET /-/v1/search?text=react&size=20&frpom=0&quality=0.65&popularity=0.98&maintenance=0.5'\n */\nexport default function (route, auth: IAuth, storage: Storage): void {\n  route.get('/-/v1/search', async (req, res, next) => {\n    let [size, from] = ['size', 'from'].map((k) => req.query[k]);\n\n    size = parseInt(size, 10) || 20;\n    from = parseInt(from, 10) || 0;\n    const data: any[] = [];\n    const transformResults = new TransFormResults({ objectMode: true });\n\n    const streamPassThrough = new PassThrough({ objectMode: true });\n    storage.searchManager?.search(streamPassThrough, {\n      query: req.query,\n      url: req.url,\n    });\n\n    const outPutStream = new PassThrough({ objectMode: true });\n    pipeline(streamPassThrough, transformResults, outPutStream, (err) => {\n      if (err) {\n        next(getInternalError(err ? err.message : 'unknown error'));\n      } else {\n        debug('Pipeline succeeded.');\n      }\n    });\n\n    outPutStream.on('data', (chunk) => {\n      data.push(chunk);\n    });\n\n    outPutStream.on('finish', async () => {\n      debug('stream finish');\n      const checkAccessPromises: searchUtils.SearchItemPkg[] = await Promise.all(\n        removeDuplicates(data).map((pkgItem) => {\n          return checkAccess(pkgItem, auth, req.remote_user);\n        })\n      );\n\n      const final: searchUtils.SearchItemPkg[] = checkAccessPromises\n        .filter((i) => !_.isNull(i))\n        .slice(from, size);\n      logger.debug(`search results ${final?.length}`);\n\n      const response: SearchResults = {\n        objects: final,\n        total: final.length,\n        time: new Date().toUTCString(),\n      };\n\n      res.status(HTTP_STATUS.OK).json(response);\n    });\n  });\n}\n"],"file":"search.js"}
+{"version":3,"sources":["../../src/v1/search.ts"],"names":["debug","route","auth","storage","checkAccess","pkg","remoteUser","Promise","resolve","reject","allow_access","packageName","package","name","err","allowed","status","String","match","get","req","res","next","size","from","map","k","query","data","parseInt","searchManager","search","url","checkAccessPromises","all","pkgItem","remote_user","final","filter","i","_","isNull","slice","logger","length","response","objects","total","time","Date","toUTCString","HTTP_STATUS","OK","json","error"],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport buildDebug from 'debug';\nimport { logger } from '@verdaccio/logger';\nimport { IAuth } from '@verdaccio/auth';\nimport { searchUtils } from '@verdaccio/core';\nimport { HTTP_STATUS } from '@verdaccio/commons-api';\nimport { Storage } from '@verdaccio/store';\nimport { Package } from '@verdaccio/types';\n\nconst debug = buildDebug('verdaccio:api:search');\n\n/**\n * Endpoint for npm search v1\n * Empty value\n *  - {\"objects\":[],\"total\":0,\"time\":\"Sun Jul 25 2021 14:09:11 GMT+0000 (Coordinated Universal Time)\"}\n * req: 'GET /-/v1/search?text=react&size=20&frpom=0&quality=0.65&popularity=0.98&maintenance=0.5'\n */\nexport default function (route, auth: IAuth, storage: Storage): void {\n  function checkAccess(pkg: any, auth: any, remoteUser): Promise<Package | null> {\n    return new Promise((resolve, reject) => {\n      auth.allow_access({ packageName: pkg?.package?.name }, remoteUser, function (err, allowed) {\n        if (err) {\n          if (err.status && String(err.status).match(/^4\\d\\d$/)) {\n            // auth plugin returns 4xx user error,\n            // that's equivalent of !allowed basically\n            allowed = false;\n            return resolve(null);\n          } else {\n            reject(err);\n          }\n        } else {\n          return resolve(allowed ? pkg : null);\n        }\n      });\n    });\n  }\n\n  route.get('/-/v1/search', async (req, res, next) => {\n    let [size, from] = ['size', 'from'].map((k) => req.query[k]);\n    let data;\n\n    size = parseInt(size, 10) || 20;\n    from = parseInt(from, 10) || 0;\n\n    try {\n      data = await storage.searchManager?.search({\n        query: req.query,\n        url: req.url,\n      });\n      debug('stream finish');\n      const checkAccessPromises: searchUtils.SearchItemPkg[] = await Promise.all(\n        data.map((pkgItem) => {\n          return checkAccess(pkgItem, auth, req.remote_user);\n        })\n      );\n\n      const final: searchUtils.SearchItemPkg[] = checkAccessPromises\n        .filter((i) => !_.isNull(i))\n        .slice(from, size);\n      logger.debug(`search results ${final?.length}`);\n\n      const response: searchUtils.SearchResults = {\n        objects: final,\n        total: final.length,\n        time: new Date().toUTCString(),\n      };\n\n      res.status(HTTP_STATUS.OK).json(response);\n    } catch (error) {\n      logger.error({ error }, 'search endpoint has failed @{error.message}');\n      next(next);\n      return;\n    }\n  });\n}\n"],"file":"search.js"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@verdaccio/api",
-	"version": "6.0.0-6-next.14",
+	"version": "6.0.0-6-next.15",
 	"description": "loaders logic",
 	"main": "./build/index.js",
 	"types": "build/index.d.ts",
@@ -30,14 +30,14 @@
 	},
 	"license": "MIT",
 	"dependencies": {
-		"@verdaccio/auth": "6.0.0-6-next.11",
+		"@verdaccio/auth": "6.0.0-6-next.12",
 		"@verdaccio/commons-api": "11.0.0-6-next.4",
 		"@verdaccio/config": "6.0.0-6-next.8",
 		"@verdaccio/core": "6.0.0-6-next.1",
-		"@verdaccio/hooks": "6.0.0-6-next.6",
-		"@verdaccio/logger": "6.0.0-6-next.4",
-		"@verdaccio/middleware": "6.0.0-6-next.11",
-		"@verdaccio/store": "6.0.0-6-next.12",
+		"@verdaccio/hooks": "6.0.0-6-next.7",
+		"@verdaccio/logger": "6.0.0-6-next.5",
+		"@verdaccio/middleware": "6.0.0-6-next.12",
+		"@verdaccio/store": "6.0.0-6-next.13",
 		"@verdaccio/tarball": "11.0.0-6-next.7",
 		"@verdaccio/utils": "6.0.0-6-next.6",
 		"cookies": "0.8.0",
@@ -48,7 +48,8 @@
 		"semver": "7.3.5"
 	},
 	"devDependencies": {
-		"@verdaccio/server": "6.0.0-6-next.19",
+		"@types/node": "16.9.1",
+		"@verdaccio/server": "6.0.0-6-next.20",
 		"@verdaccio/types": "11.0.0-6-next.8",
 		"body-parser": "1.19.0",
 		"lodash": "4.17.21",

package/src/v1/search.ts

@@ -1,124 +1,14 @@
-import { Transform, pipeline, PassThrough } from 'stream';
 import _ from 'lodash';
 import buildDebug from 'debug';
-import { Package } from '@verdaccio/types';
 import { logger } from '@verdaccio/logger';
 import { IAuth } from '@verdaccio/auth';
 import { searchUtils } from '@verdaccio/core';
-import { HTTP_STATUS, getInternalError } from '@verdaccio/commons-api';
+import { HTTP_STATUS } from '@verdaccio/commons-api';
 import { Storage } from '@verdaccio/store';
+import { Package } from '@verdaccio/types';
 
 const debug = buildDebug('verdaccio:api:search');
 
-type SearchResults = {
-  objects: searchUtils.SearchItemPkg[];
-  total: number;
-  time: string;
-};
-
-// const personMatch = (person, search) => {
-//   if (typeof person === 'string') {
-//     return person.includes(search);
-//   }
-
-//   if (typeof person === 'object') {
-//     for (const field of Object.values(person)) {
-//       if (typeof field === 'string' && field.includes(search)) {
-//         return true;
-//       }
-//     }
-//   }
-
-//   return false;
-// };
-
-// const matcher = function (query) {
-//   const match = query.match(/author:(.*)/);
-//   if (match !== null) {
-//     return function (pkg) {
-//       return personMatch(pkg.author, match[1]);
-//     };
-//   }
-
-//   // TODO: maintainer, keywords, boost-exact
-//   // TODO implement some scoring system for freetext
-//   return (pkg) => {
-//     return ['name', 'displayName', 'description']
-//       .map((k) => {
-//         return pkg[k];
-//       })
-//       .filter((x) => {
-//         return x !== undefined;
-//       })
-//       .some((txt) => {
-//         return txt.includes(query);
-//       });
-//   };
-// };
-
-function removeDuplicates(results) {
-  const pkgNames: any[] = [];
-  return results.filter((pkg) => {
-    if (pkgNames.includes(pkg?.package?.name)) {
-      return false;
-    }
-    pkgNames.push(pkg?.package?.name);
-    return true;
-  });
-}
-
-function checkAccess(pkg: any, auth: any, remoteUser): Promise<Package | null> {
-  return new Promise((resolve, reject) => {
-    auth.allow_access({ packageName: pkg?.package?.name }, remoteUser, function (err, allowed) {
-      if (err) {
-        if (err.status && String(err.status).match(/^4\d\d$/)) {
-          // auth plugin returns 4xx user error,
-          // that's equivalent of !allowed basically
-          allowed = false;
-          return resolve(null);
-        } else {
-          reject(err);
-        }
-      } else {
-        return resolve(allowed ? pkg : null);
-      }
-    });
-  });
-}
-
-class TransFormResults extends Transform {
-  public constructor(options) {
-    super(options);
-  }
-
-  /**
-   * Transform either array of packages or a single package into a stream of packages.
-   * From uplinks the chunks are array but from local packages are objects.
-   * @param {string} chunk
-   * @param {string} encoding
-   * @param {function} done
-   * @returns {void}
-   * @override
-   */
-  public _transform(chunk, _encoding, callback) {
-    if (_.isArray(chunk)) {
-      (chunk as searchUtils.SearchItem[])
-        .filter((pkgItem) => {
-          debug(`streaming remote pkg name ${pkgItem?.package?.name}`);
-          return true;
-        })
-        .forEach((pkgItem) => {
-          this.push(pkgItem);
-        });
-      return callback();
-    } else {
-      debug(`streaming local pkg name ${chunk?.package?.name}`);
-      this.push(chunk);
-      return callback();
-    }
-  }
-}
-
 /**
  * Endpoint for npm search v1
  * Empty value
@@ -126,37 +16,40 @@ class TransFormResults extends Transform {
  * req: 'GET /-/v1/search?text=react&size=20&frpom=0&quality=0.65&popularity=0.98&maintenance=0.5'
  */
 export default function (route, auth: IAuth, storage: Storage): void {
+  function checkAccess(pkg: any, auth: any, remoteUser): Promise<Package | null> {
+    return new Promise((resolve, reject) => {
+      auth.allow_access({ packageName: pkg?.package?.name }, remoteUser, function (err, allowed) {
+        if (err) {
+          if (err.status && String(err.status).match(/^4\d\d$/)) {
+            // auth plugin returns 4xx user error,
+            // that's equivalent of !allowed basically
+            allowed = false;
+            return resolve(null);
+          } else {
+            reject(err);
+          }
+        } else {
+          return resolve(allowed ? pkg : null);
+        }
+      });
+    });
+  }
+
   route.get('/-/v1/search', async (req, res, next) => {
     let [size, from] = ['size', 'from'].map((k) => req.query[k]);
+    let data;
 
     size = parseInt(size, 10) || 20;
     from = parseInt(from, 10) || 0;
-    const data: any[] = [];
-    const transformResults = new TransFormResults({ objectMode: true });
-
-    const streamPassThrough = new PassThrough({ objectMode: true });
-    storage.searchManager?.search(streamPassThrough, {
-      query: req.query,
-      url: req.url,
-    });
-
-    const outPutStream = new PassThrough({ objectMode: true });
-    pipeline(streamPassThrough, transformResults, outPutStream, (err) => {
-      if (err) {
-        next(getInternalError(err ? err.message : 'unknown error'));
-      } else {
-        debug('Pipeline succeeded.');
-      }
-    });
 
-    outPutStream.on('data', (chunk) => {
-      data.push(chunk);
-    });
-
-    outPutStream.on('finish', async () => {
+    try {
+      data = await storage.searchManager?.search({
+        query: req.query,
+        url: req.url,
+      });
       debug('stream finish');
       const checkAccessPromises: searchUtils.SearchItemPkg[] = await Promise.all(
-        removeDuplicates(data).map((pkgItem) => {
+        data.map((pkgItem) => {
           return checkAccess(pkgItem, auth, req.remote_user);
         })
       );
@@ -166,13 +59,17 @@ export default function (route, auth: IAuth, storage: Storage): void {
         .slice(from, size);
       logger.debug(`search results ${final?.length}`);
 
-      const response: SearchResults = {
+      const response: searchUtils.SearchResults = {
         objects: final,
         total: final.length,
         time: new Date().toUTCString(),
       };
 
       res.status(HTTP_STATUS.OK).json(response);
-    });
+    } catch (error) {
+      logger.error({ error }, 'search endpoint has failed @{error.message}');
+      next(next);
+      return;
+    }
   });
 }