@verdaccio/local-storage 10.0.7 → 11.0.0-6-next.9

package/{lib → build}/local-fs.d.ts

@@ -1,11 +1,10 @@
-/// <reference types="node" />
 import { ReadTarball } from '@verdaccio/streams';
 import { Callback, Logger, Package, ILocalPackageManager, IUploadTarball } from '@verdaccio/types';
-import { VerdaccioError } from '@verdaccio/commons-api';
+import { VerdaccioError } from '@verdaccio/core';
 export declare const fileExist = "EEXISTS";
 export declare const noSuchFile = "ENOENT";
 export declare const resourceNotAvailable = "EAGAIN";
-export declare const pkgFileName = "package.json";
+export declare const packageJSONFileName = "package.json";
 export declare const fSError: (message: string, code?: number) => VerdaccioError;
 export declare type ILocalFSPackageManager = ILocalPackageManager & {
     path: string;
@@ -30,8 +29,8 @@ export default class LocalFS implements ILocalFSPackageManager {
       * @param {*} onEnd
       */
     updatePackage(name: string, updateHandler: Callback, onWrite: Callback, transformPackage: Function, onEnd: Callback): void;
-    deletePackage(packageName: string, callback: (err: NodeJS.ErrnoException | null) => void): void;
-    removePackage(callback: (err: NodeJS.ErrnoException | null) => void): void;
+    deletePackage(packageName: string): Promise<void>;
+    removePackage(): Promise<void>;
     createPackage(name: string, value: Package, cb: Callback): void;
     savePackage(name: string, value: Package, cb: Callback): void;
     readPackage(name: string, cb: Callback): void;

package/{lib → build}/local-fs.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.fSError = exports.pkgFileName = exports.resourceNotAvailable = exports.noSuchFile = exports.fileExist = void 0;
+exports.default = exports.fSError = exports.packageJSONFileName = exports.resourceNotAvailable = exports.noSuchFile = exports.fileExist = void 0;
 
 var _fs = _interopRequireDefault(require("fs"));
 
@@ -13,13 +13,13 @@ var _debug = _interopRequireDefault(require("debug"));
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
-var _mkdirp = _interopRequireDefault(require("mkdirp"));
-
 var _streams = require("@verdaccio/streams");
 
 var _fileLocking = require("@verdaccio/file-locking");
 
-var _commonsApi = require("@verdaccio/commons-api");
+var _core = require("@verdaccio/core");
+
+var _fs2 = require("./fs");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -31,14 +31,15 @@ const noSuchFile = 'ENOENT';
 exports.noSuchFile = noSuchFile;
 const resourceNotAvailable = 'EAGAIN';
 exports.resourceNotAvailable = resourceNotAvailable;
-const pkgFileName = 'package.json';
-exports.pkgFileName = pkgFileName;
-const debug = (0, _debug.default)('verdaccio:plugin:local-storage:fs');
+const packageJSONFileName = 'package.json';
+exports.packageJSONFileName = packageJSONFileName;
+const debug = (0, _debug.default)('verdaccio:plugin:local-storage:local-fs');
 
 const fSError = function (message, code = 409) {
-  const err = (0, _commonsApi.getCode)(code, message); // FIXME: we should return http-status codes here instead, future improvement
+  const err = _core.errorUtils.getCode(code, message); // FIXME: we should return http-status codes here instead, future improvement
   // @ts-ignore
 
+
   err.code = message;
   return err;
 };
@@ -102,7 +103,7 @@ class LocalFS {
 
 
   updatePackage(name, updateHandler, onWrite, transformPackage, onEnd) {
-    this._lockAndReadJSON(pkgFileName, (err, json) => {
+    this._lockAndReadJSON(packageJSONFileName, (err, json) => {
       let locked = false;
       const self = this; // callback that cleans up lock first
 
@@ -111,7 +112,9 @@ class LocalFS {
         const _args = arguments;
 
         if (locked) {
-          self._unlockJSON(pkgFileName, () => {
+          debug('unlock %s', packageJSONFileName);
+
+          self._unlockJSON(packageJSONFileName, () => {
             // ignore any error from the unlock
             if (lockError !== null) {
               debug('lock file: %o has failed with error %o', name, lockError);
@@ -132,9 +135,9 @@ class LocalFS {
 
       if (_lodash.default.isNil(err) === false) {
         if (err.code === resourceNotAvailable) {
-          return unLockCallback((0, _commonsApi.getInternalError)('resource temporarily unavailable'));
+          return unLockCallback(_core.errorUtils.getInternalError('resource temporarily unavailable'));
         } else if (err.code === noSuchFile) {
-          return unLockCallback((0, _commonsApi.getNotFound)());
+          return unLockCallback(_core.errorUtils.getNotFound());
         } else {
           return unLockCallback(err);
         }
@@ -150,43 +153,48 @@ class LocalFS {
     });
   }
 
-  deletePackage(packageName, callback) {
-    debug('delete a package %o', packageName);
-    return _fs.default.unlink(this._getStorage(packageName), callback);
+  async deletePackage(packageName) {
+    debug('delete a file/package %o', packageName);
+    return await (0, _fs2.unlinkPromise)(this._getStorage(packageName));
   }
 
-  removePackage(callback) {
-    debug('remove a package %o', this.path);
-
-    _fs.default.rmdir(this._getStorage('.'), callback);
+  async removePackage() {
+    debug('remove a package folder %o', this.path);
+    await (0, _fs2.rmdirPromise)(this._getStorage('.'));
   }
 
   createPackage(name, value, cb) {
     debug('create a package %o', name);
 
-    this._createFile(this._getStorage(pkgFileName), this._convertToString(value), cb);
+    this._createFile(this._getStorage(packageJSONFileName), this._convertToString(value), cb);
   }
 
   savePackage(name, value, cb) {
     debug('save a package %o', name);
 
-    this._writeFile(this._getStorage(pkgFileName), this._convertToString(value), cb);
+    this._writeFile(this._getStorage(packageJSONFileName), this._convertToString(value), cb);
   }
 
   readPackage(name, cb) {
     debug('read a package %o', name);
 
-    this._readStorageFile(this._getStorage(pkgFileName)).then(res => {
+    this._readStorageFile(this._getStorage(packageJSONFileName)).then(res => {
       try {
         const data = JSON.parse(res.toString('utf8'));
         debug('read storage file %o has succeed', name);
         cb(null, data);
       } catch (err) {
-        debug('parse storage file %o has failed with error %o', name, err);
-        cb(err);
+        debug('parse error');
+        this.logger.error({
+          err,
+          name
+        }, 'error @{err.message}  on parse @{name}');
+        throw err;
       }
-    }, err => {
-      debug('read storage file %o has failed with error %o', name, err);
+    }).catch(err => {
+      this.logger.error({
+        err
+      }, 'error on read storage file @{err.message}');
       return cb(err);
     });
   }
@@ -317,20 +325,16 @@ class LocalFS {
     });
   }
 
-  _readStorageFile(name) {
-    return new Promise((resolve, reject) => {
-      debug('reading the file: %o', name);
+  async _readStorageFile(name) {
+    debug('reading the file: %o', name);
 
-      _fs.default.readFile(name, (err, data) => {
-        if (err) {
-          debug('error reading the file: %o with error %o', name, err);
-          reject(err);
-        } else {
-          debug('read file %o succeed', name);
-          resolve(data);
-        }
-      });
-    });
+    try {
+      debug('reading the file: %o', name);
+      return await (0, _fs2.readFilePromise)(name);
+    } catch (err) {
+      debug('error reading the file: %o with error %o', name, err.message);
+      throw err;
+    }
   }
 
   _convertToString(value) {
@@ -360,10 +364,14 @@ class LocalFS {
 
     createTempFile(err => {
       if (err && err.code === noSuchFile) {
-        (0, _mkdirp.default)(_path.default.dirname(dest)).then(() => {
+        _fs.default.mkdir(_path.default.dirname(dest), {
+          recursive: true
+        }, function (err) {
+          if (err) {
+            return cb(err);
+          }
+
           createTempFile(cb);
-        }).catch(err => {
-          return cb(err);
         });
       } else {
         cb(err);
@@ -374,11 +382,15 @@ class LocalFS {
   _lockAndReadJSON(name, cb) {
     const fileName = this._getStorage(name);
 
+    debug('lock and read a file %o', fileName);
     (0, _fileLocking.readFile)(fileName, {
       lock: true,
       parse: true
     }, (err, res) => {
       if (err) {
+        this.logger.error({
+          err
+        }, 'error on lock file @{err.message}');
         debug('error on lock and read json for file: %o', name);
         return cb(err);
       }

package/build/local-fs.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/local-fs.ts"],"names":["fileExist","noSuchFile","resourceNotAvailable","packageJSONFileName","debug","fSError","message","code","err","errorUtils","getCode","tempFile","str","String","Math","random","substr","renameTmp","src","dst","_cb","cb","fs","unlink","process","platform","rename","tmp","LocalFS","constructor","path","logger","updatePackage","name","updateHandler","onWrite","transformPackage","onEnd","_lockAndReadJSON","json","locked","self","unLockCallback","lockError","_args","arguments","_unlockJSON","apply","_","isNil","getInternalError","getNotFound","deletePackage","packageName","_getStorage","removePackage","createPackage","value","_createFile","_convertToString","savePackage","_writeFile","readPackage","_readStorageFile","then","res","data","JSON","parse","toString","error","catch","writeTarball","uploadStream","UploadTarball","_ended","on","pathName","access","fileNotFound","exists","emit","temporalName","join","replace","file","createWriteStream","removeTempFile","opened","pipe","done","onend","end","abort","readTarball","readTarballStream","ReadTarball","readStream","createReadStream","fd","fstat","stats","size","close","contents","callback","open","stringify","fileName","storagePath","dest","createTempFile","tempFilePath","writeFile","mkdir","dirname","recursive","lock"],"mappings":"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","sourcesContent":["/* eslint-disable no-undef */\n\nimport fs from 'fs';\nimport path from 'path';\nimport buildDebug from 'debug';\n\nimport _ from 'lodash';\nimport { UploadTarball, ReadTarball } from '@verdaccio/streams';\nimport { unlockFile, readFile } from '@verdaccio/file-locking';\nimport { Callback, Logger, Package, ILocalPackageManager, IUploadTarball } from '@verdaccio/types';\nimport { VerdaccioError, errorUtils } from '@verdaccio/core';\nimport { unlinkPromise, rmdirPromise, readFilePromise } from './fs';\n\nexport const fileExist = 'EEXISTS';\nexport const noSuchFile = 'ENOENT';\nexport const resourceNotAvailable = 'EAGAIN';\nexport const packageJSONFileName = 'package.json';\n\nconst debug = buildDebug('verdaccio:plugin:local-storage:local-fs');\n\nexport const fSError = function (message: string, code = 409): VerdaccioError {\n  const err: VerdaccioError = errorUtils.getCode(code, message);\n  // FIXME: we should return http-status codes here instead, future improvement\n  // @ts-ignore\n  err.code = message;\n\n  return err;\n};\n\nconst tempFile = function (str): string {\n  return `${str}.tmp${String(Math.random()).substr(2)}`;\n};\n\nconst renameTmp = function (src, dst, _cb): void {\n  const cb = (err): void => {\n    if (err) {\n      fs.unlink(src, () => {});\n    }\n    _cb(err);\n  };\n\n  if (process.platform !== 'win32') {\n    return fs.rename(src, dst, cb);\n  }\n\n  // windows can't remove opened file,\n  // but it seem to be able to rename it\n  const tmp = tempFile(dst);\n  fs.rename(dst, tmp, function (err) {\n    fs.rename(src, dst, cb);\n    if (!err) {\n      fs.unlink(tmp, () => {});\n    }\n  });\n};\n\nexport type ILocalFSPackageManager = ILocalPackageManager & { path: string };\n\nexport default class LocalFS implements ILocalFSPackageManager {\n  public path: string;\n  public logger: Logger;\n\n  public constructor(path: string, logger: Logger) {\n    this.path = path;\n    this.logger = logger;\n  }\n\n  /**\n    *  This function allows to update the package thread-safely\n      Algorithm:\n      1. lock package.json for writing\n      2. read package.json\n      3. updateFn(pkg, cb), and wait for cb\n      4. write package.json.tmp\n      5. move package.json.tmp package.json\n      6. callback(err?)\n    * @param {*} name\n    * @param {*} updateHandler\n    * @param {*} onWrite\n    * @param {*} transformPackage\n    * @param {*} onEnd\n    */\n  public updatePackage(\n    name: string,\n    updateHandler: Callback,\n    onWrite: Callback,\n    transformPackage: Function,\n    onEnd: Callback\n  ): void {\n    this._lockAndReadJSON(packageJSONFileName, (err, json) => {\n      let locked = false;\n      const self = this;\n      // callback that cleans up lock first\n      const unLockCallback = function (lockError: Error): void {\n        // eslint-disable-next-line prefer-rest-params\n        const _args = arguments;\n\n        if (locked) {\n          debug('unlock %s', packageJSONFileName);\n          self._unlockJSON(packageJSONFileName, () => {\n            // ignore any error from the unlock\n            if (lockError !== null) {\n              debug('lock file: %o has failed with error %o', name, lockError);\n            }\n\n            onEnd.apply(lockError, _args);\n          });\n        } else {\n          debug('file: %o has been updated', name);\n          onEnd(..._args);\n        }\n      };\n\n      if (!err) {\n        locked = true;\n        debug('file: %o has been locked', name);\n      }\n\n      if (_.isNil(err) === false) {\n        if (err.code === resourceNotAvailable) {\n          return unLockCallback(errorUtils.getInternalError('resource temporarily unavailable'));\n        } else if (err.code === noSuchFile) {\n          return unLockCallback(errorUtils.getNotFound());\n        } else {\n          return unLockCallback(err);\n        }\n      }\n\n      updateHandler(json, (err) => {\n        if (err) {\n          return unLockCallback(err);\n        }\n\n        onWrite(name, transformPackage(json), unLockCallback);\n      });\n    });\n  }\n\n  public async deletePackage(packageName: string): Promise<void> {\n    debug('delete a file/package %o', packageName);\n\n    return await unlinkPromise(this._getStorage(packageName));\n  }\n\n  public async removePackage(): Promise<void> {\n    debug('remove a package folder %o', this.path);\n\n    await rmdirPromise(this._getStorage('.'));\n  }\n\n  public createPackage(name: string, value: Package, cb: Callback): void {\n    debug('create a package %o', name);\n\n    this._createFile(this._getStorage(packageJSONFileName), this._convertToString(value), cb);\n  }\n\n  public savePackage(name: string, value: Package, cb: Callback): void {\n    debug('save a package %o', name);\n\n    this._writeFile(this._getStorage(packageJSONFileName), this._convertToString(value), cb);\n  }\n\n  public readPackage(name: string, cb: Callback): void {\n    debug('read a package %o', name);\n\n    this._readStorageFile(this._getStorage(packageJSONFileName))\n      .then((res) => {\n        try {\n          const data: any = JSON.parse(res.toString('utf8'));\n\n          debug('read storage file %o has succeed', name);\n          cb(null, data);\n        } catch (err: any) {\n          debug('parse error');\n          this.logger.error({ err, name }, 'error @{err.message}  on parse @{name}');\n          throw err;\n        }\n      })\n      .catch((err) => {\n        this.logger.error({ err }, 'error on read storage file @{err.message}');\n        return cb(err);\n      });\n  }\n\n  public writeTarball(name: string): IUploadTarball {\n    const uploadStream = new UploadTarball({});\n    debug('write a tarball for a package %o', name);\n\n    let _ended = 0;\n    uploadStream.on('end', function () {\n      _ended = 1;\n    });\n\n    const pathName: string = this._getStorage(name);\n\n    fs.access(pathName, (fileNotFound) => {\n      const exists = !fileNotFound;\n      if (exists) {\n        uploadStream.emit('error', fSError(fileExist));\n      } else {\n        const temporalName = path.join(\n          this.path,\n          `${name}.tmp-${String(Math.random()).replace(/^0\\./, '')}`\n        );\n        debug('write a temporal name %o', temporalName);\n        const file = fs.createWriteStream(temporalName);\n        const removeTempFile = (): void => fs.unlink(temporalName, () => {});\n        let opened = false;\n        uploadStream.pipe(file);\n\n        uploadStream.done = function (): void {\n          const onend = function (): void {\n            file.on('close', function () {\n              renameTmp(temporalName, pathName, function (err) {\n                if (err) {\n                  uploadStream.emit('error', err);\n                } else {\n                  uploadStream.emit('success');\n                }\n              });\n            });\n            file.end();\n          };\n          if (_ended) {\n            onend();\n          } else {\n            uploadStream.on('end', onend);\n          }\n        };\n\n        uploadStream.abort = function (): void {\n          if (opened) {\n            opened = false;\n            file.on('close', function () {\n              removeTempFile();\n            });\n          } else {\n            // if the file does not recieve any byte never is opened and has to be removed anyway.\n            removeTempFile();\n          }\n          file.end();\n        };\n\n        file.on('open', function () {\n          opened = true;\n          // re-emitting open because it's handled in storage.js\n          uploadStream.emit('open');\n        });\n\n        file.on('error', function (err) {\n          uploadStream.emit('error', err);\n        });\n      }\n    });\n\n    return uploadStream;\n  }\n\n  public readTarball(name: string): ReadTarball {\n    const pathName: string = this._getStorage(name);\n    debug('read a a tarball %o on path %o', name, pathName);\n\n    const readTarballStream = new ReadTarball({});\n\n    const readStream = fs.createReadStream(pathName);\n\n    readStream.on('error', function (err) {\n      debug('error on read a tarball %o with error %o', name, err);\n      readTarballStream.emit('error', err);\n    });\n\n    readStream.on('open', function (fd) {\n      fs.fstat(fd, function (err, stats) {\n        if (_.isNil(err) === false) {\n          debug('error on read a tarball %o with error %o', name, err);\n          return readTarballStream.emit('error', err);\n        }\n        readTarballStream.emit('content-length', stats.size);\n        readTarballStream.emit('open');\n        debug('open on read a tarball %o', name);\n        readStream.pipe(readTarballStream);\n      });\n    });\n\n    readTarballStream.abort = function (): void {\n      debug('abort on read a tarball %o', name);\n      readStream.close();\n    };\n\n    return readTarballStream;\n  }\n\n  private _createFile(name: string, contents: any, callback: Function): void {\n    debug(' create a new file: %o', name);\n\n    fs.open(name, 'wx', (err) => {\n      if (err) {\n        // native EEXIST used here to check exception on fs.open\n        if (err.code === 'EEXIST') {\n          debug('file %o cannot be created, it already exists: %o', name);\n          return callback(fSError(fileExist));\n        }\n      }\n\n      this._writeFile(name, contents, callback);\n    });\n  }\n\n  private async _readStorageFile(name: string): Promise<any> {\n    debug('reading the file: %o', name);\n    try {\n      debug('reading the file: %o', name);\n      return await readFilePromise(name);\n    } catch (err: any) {\n      debug('error reading the file: %o with error %o', name, err.message);\n      throw err;\n    }\n  }\n\n  private _convertToString(value: Package): string {\n    return JSON.stringify(value, null, '\\t');\n  }\n\n  private _getStorage(fileName = ''): string {\n    const storagePath: string = path.join(this.path, fileName);\n\n    return storagePath;\n  }\n\n  private _writeFile(dest: string, data: string, cb: Callback): void {\n    const createTempFile = (cb): void => {\n      const tempFilePath = tempFile(dest);\n\n      fs.writeFile(tempFilePath, data, (err) => {\n        if (err) {\n          debug('error on write the file: %o', dest);\n          return cb(err);\n        }\n\n        debug('creating a new file:: %o', dest);\n        renameTmp(tempFilePath, dest, cb);\n      });\n    };\n\n    createTempFile((err) => {\n      if (err && err.code === noSuchFile) {\n        fs.mkdir(path.dirname(dest), { recursive: true }, function (err) {\n          if (err) {\n            return cb(err);\n          }\n          createTempFile(cb);\n        });\n      } else {\n        cb(err);\n      }\n    });\n  }\n\n  private _lockAndReadJSON(name: string, cb: Function): void {\n    const fileName: string = this._getStorage(name);\n    debug('lock and read a file %o', fileName);\n    readFile(\n      fileName,\n      {\n        lock: true,\n        parse: true,\n      },\n      (err, res) => {\n        if (err) {\n          this.logger.error({ err }, 'error on lock file @{err.message}');\n          debug('error on lock and read json for file: %o', name);\n\n          return cb(err);\n        }\n        debug('lock and read json for file: %o', name);\n\n        return cb(null, res);\n      }\n    );\n  }\n\n  private _unlockJSON(name: string, cb: Function): void {\n    unlockFile(this._getStorage(name), cb);\n  }\n}\n"],"file":"local-fs.js"}

package/{lib → build}/pkg-utils.d.ts

@@ -1,2 +1,2 @@
 import { LocalStorage, Logger } from '@verdaccio/types';
-export declare function loadPrivatePackages(path: string, logger: Logger): LocalStorage;
+export declare function loadPrivatePackages(path: string, logger: Logger): Promise<LocalStorage>;

package/{lib → build}/pkg-utils.js

@@ -5,23 +5,22 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.loadPrivatePackages = loadPrivatePackages;
 
-var _fs = _interopRequireDefault(require("fs"));
-
 var _lodash = _interopRequireDefault(require("lodash"));
 
+var _fs = require("./fs");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function loadPrivatePackages(path, logger) {
+async function loadPrivatePackages(path, logger) {
   const list = [];
   const emptyDatabase = {
     list,
     secret: ''
   };
-
-  const data = _fs.default.readFileSync(path, 'utf8');
+  const data = await (0, _fs.readFilePromise)(path);
 
   if (_lodash.default.isNil(data)) {
-    // readFileSync is platform specific, FreeBSD might return null
+    // readFilePromise is platform specific, FreeBSD might return null
     return emptyDatabase;
   }
 
@@ -30,7 +29,10 @@ function loadPrivatePackages(path, logger) {
   try {
     db = JSON.parse(data);
   } catch (err) {
-    logger.error(`Package database file corrupted (invalid JSON), please check the error` + ` printed below.\nFile Path: ${path}`, err);
+    logger.error({
+      err,
+      path
+    }, `Package database file corrupted (invalid JSON) @{err.message}, please check the error printed below.File Path: @{path}`);
     throw Error('Package database file corrupted (invalid JSON)');
   }
 

package/build/pkg-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/pkg-utils.ts"],"names":["loadPrivatePackages","path","logger","list","emptyDatabase","secret","data","_","isNil","db","JSON","parse","err","error","Error","isEmpty"],"mappings":";;;;;;;AAAA;;AAEA;;;;AAEO,eAAeA,mBAAf,CAAmCC,IAAnC,EAAiDC,MAAjD,EAAwF;AAC7F,QAAMC,IAAiB,GAAG,EAA1B;AACA,QAAMC,aAAa,GAAG;AAAED,IAAAA,IAAF;AAAQE,IAAAA,MAAM,EAAE;AAAhB,GAAtB;AACA,QAAMC,IAAI,GAAG,MAAM,yBAAgBL,IAAhB,CAAnB;;AACA,MAAIM,gBAAEC,KAAF,CAAQF,IAAR,CAAJ,EAAmB;AACjB;AACA,WAAOF,aAAP;AACD;;AAED,MAAIK,EAAJ;;AACA,MAAI;AACFA,IAAAA,EAAE,GAAGC,IAAI,CAACC,KAAL,CAAWL,IAAX,CAAL;AACD,GAFD,CAEE,OAAOM,GAAP,EAAiB;AACjBV,IAAAA,MAAM,CAACW,KAAP,CACE;AACED,MAAAA,GADF;AAEEX,MAAAA;AAFF,KADF,EAKG,wHALH;AAOA,UAAMa,KAAK,CAAC,gDAAD,CAAX;AACD;;AAED,MAAIP,gBAAEQ,OAAF,CAAUN,EAAV,CAAJ,EAAmB;AACjB,WAAOL,aAAP;AACD;;AAED,SAAOK,EAAP;AACD","sourcesContent":["import _ from 'lodash';\nimport { LocalStorage, StorageList, Logger } from '@verdaccio/types';\nimport { readFilePromise } from './fs';\n\nexport async function loadPrivatePackages(path: string, logger: Logger): Promise<LocalStorage> {\n  const list: StorageList = [];\n  const emptyDatabase = { list, secret: '' };\n  const data = await readFilePromise(path);\n  if (_.isNil(data)) {\n    // readFilePromise is platform specific, FreeBSD might return null\n    return emptyDatabase;\n  }\n\n  let db;\n  try {\n    db = JSON.parse(data);\n  } catch (err: any) {\n    logger.error(\n      {\n        err,\n        path,\n      },\n      `Package database file corrupted (invalid JSON) @{err.message}, please check the error printed below.File Path: @{path}`\n    );\n    throw Error('Package database file corrupted (invalid JSON)');\n  }\n\n  if (_.isEmpty(db)) {\n    return emptyDatabase;\n  }\n\n  return db;\n}\n"],"file":"pkg-utils.js"}

package/{lib → build}/token.d.ts

@@ -4,7 +4,6 @@ export default class TokenActions implements ITokenActions {
     config: Config;
     tokenDb: low.LowdbAsync<any> | null;
     constructor(config: Config);
-    _dbGenPath(dbName: string, config: Config): string;
     private getTokenDb;
     saveToken(token: Token): Promise<void>;
     deleteToken(user: string, tokenKey: string): Promise<void>;

package/{lib → build}/token.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _path = _interopRequireDefault(require("path"));
-
 var _lodash = _interopRequireDefault(require("lodash"));
 
 var _lowdb = _interopRequireDefault(require("lowdb"));
@@ -17,6 +15,8 @@ var _Memory = _interopRequireDefault(require("lowdb/adapters/Memory"));
 
 var _debug = _interopRequireDefault(require("debug"));
 
+var _utils = require("./utils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -34,10 +34,6 @@ class TokenActions {
     this.tokenDb = null;
   }
 
-  _dbGenPath(dbName, config) {
-    return _path.default.join(_path.default.resolve(_path.default.dirname(config.config_path || ''), config.storage, dbName));
-  }
-
   async getTokenDb() {
     if (!this.tokenDb) {
       debug('token database is not defined');
@@ -48,9 +44,7 @@ class TokenActions {
         adapter = new _Memory.default('');
       } else {
         debug('token async adapter');
-
-        const pathDb = this._dbGenPath(TOKEN_DB_NAME, this.config);
-
+        const pathDb = (0, _utils._dbGenPath)(TOKEN_DB_NAME, this.config);
         adapter = new _FileAsync.default(pathDb);
       }
 
@@ -73,8 +67,7 @@ class TokenActions {
     } else {
       // types does not match with valid implementation
       // @ts-ignore
-      await db.get(token.user) // @ts-ignore
-      .push(token).write();
+      await db.get(token.user).push(token).write();
     }
 
     debug('data %o', await db.getState());

package/build/token.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/token.ts"],"names":["debug","TOKEN_DB_NAME","TokenActions","constructor","config","tokenDb","getTokenDb","adapter","process","env","NODE_ENV","FileMemory","pathDb","FileAsync","saveToken","token","key","db","userData","get","user","value","_","isNil","set","write","push","getState","deleteToken","tokenKey","userTokens","Error","length","remainingTokens","filter","readTokens","tokens"],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport low from 'lowdb';\nimport FileAsync from 'lowdb/adapters/FileAsync';\nimport FileMemory from 'lowdb/adapters/Memory';\nimport buildDebug from 'debug';\n\nimport { ITokenActions, Config, Token, TokenFilter } from '@verdaccio/types';\nimport { _dbGenPath } from './utils';\n\nconst debug = buildDebug('verdaccio:plugin:local-storage:token');\n\nconst TOKEN_DB_NAME = '.token-db.json';\n\nexport default class TokenActions implements ITokenActions {\n  public config: Config;\n  public tokenDb: low.LowdbAsync<any> | null;\n\n  public constructor(config: Config) {\n    this.config = config;\n    this.tokenDb = null;\n  }\n\n  private async getTokenDb(): Promise<low.LowdbAsync<any>> {\n    if (!this.tokenDb) {\n      debug('token database is not defined');\n      let adapter;\n      if (process.env.NODE_ENV === 'test') {\n        debug('token memory adapter');\n        adapter = new FileMemory('');\n      } else {\n        debug('token async adapter');\n        const pathDb = _dbGenPath(TOKEN_DB_NAME, this.config);\n        adapter = new FileAsync(pathDb);\n      }\n      debug('token bd generated');\n      this.tokenDb = await low(adapter);\n    }\n\n    return this.tokenDb;\n  }\n\n  public async saveToken(token: Token): Promise<void> {\n    debug('token key %o', token.key);\n    const db = await this.getTokenDb();\n    const userData = await db.get(token.user).value();\n    debug('user data %o', userData);\n    if (_.isNil(userData)) {\n      await db.set(token.user, [token]).write();\n      debug('token user %o new database', token.user);\n    } else {\n      // types does not match with valid implementation\n      // @ts-ignore\n      await db.get(token.user).push(token).write();\n    }\n    debug('data %o', await db.getState());\n    debug('token saved %o', token.user);\n  }\n\n  public async deleteToken(user: string, tokenKey: string): Promise<void> {\n    const db = await this.getTokenDb();\n    const userTokens = await db.get(user).value();\n    if (_.isNil(userTokens)) {\n      throw new Error('user not found');\n    }\n    debug('tokens %o - %o', userTokens, userTokens.length);\n    const remainingTokens = userTokens.filter(({ key }) => {\n      debug('key %o', key);\n      return key !== tokenKey;\n    });\n    await db.set(user, remainingTokens).write();\n    debug('removed tokens key %o', tokenKey);\n  }\n\n  public async readTokens(filter: TokenFilter): Promise<Token[]> {\n    const { user } = filter;\n    debug('read tokens with %o', user);\n    const db = await this.getTokenDb();\n    const tokens = await db.get(user).value();\n    return tokens || [];\n  }\n}\n"],"file":"token.js"}

package/{lib → build}/utils.d.ts

@@ -1,8 +1,10 @@
 /// <reference types="node" />
 import fs from 'fs';
+import { Config } from '@verdaccio/types';
 export declare function getFileStats(packagePath: string): Promise<fs.Stats>;
 export declare function readDirectory(packagePath: string): Promise<string[]>;
 export declare function findPackages(storagePath: string, validationHandler: Function): Promise<{
     name: string;
     path: string;
 }[]>;
+export declare function _dbGenPath(dbName: string, config: Pick<Config, 'config_path' | 'storage'>): string;

package/{lib → build}/utils.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getFileStats = getFileStats;
 exports.readDirectory = readDirectory;
 exports.findPackages = findPackages;
+exports._dbGenPath = _dbGenPath;
 
 var _fs = _interopRequireDefault(require("fs"));
 
@@ -92,5 +93,8 @@ async function findPackages(storagePath, validationHandler) {
     resolve(listPackages);
   });
 }
-/* eslint-enable no-async-promise-executor */
+
+function _dbGenPath(dbName, config) {
+  return _path.default.join(_path.default.resolve(_path.default.dirname(config.config_path || ''), config.storage, dbName));
+}
 //# sourceMappingURL=utils.js.map

package/build/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/utils.ts"],"names":["getFileStats","packagePath","Promise","resolve","reject","fs","stat","err","stats","_","isNil","readDirectory","readdir","scopedPackages","hasScope","file","match","findPackages","storagePath","validationHandler","listPackages","scopePath","path","storageDirs","directory","scopeDirectory","scopedDirName","push","name","error","_dbGenPath","dbName","config","join","dirname","config_path","storage"],"mappings":"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","sourcesContent":["import fs from 'fs';\nimport path from 'path';\nimport _ from 'lodash';\nimport { Config } from '@verdaccio/types';\n\nexport function getFileStats(packagePath: string): Promise<fs.Stats> {\n  return new Promise((resolve, reject): void => {\n    fs.stat(packagePath, (err, stats) => {\n      if (_.isNil(err) === false) {\n        return reject(err);\n      }\n      resolve(stats);\n    });\n  });\n}\n\nexport function readDirectory(packagePath: string): Promise<string[]> {\n  return new Promise((resolve, reject): void => {\n    fs.readdir(packagePath, (err, scopedPackages) => {\n      if (_.isNil(err) === false) {\n        return reject(err);\n      }\n\n      resolve(scopedPackages);\n    });\n  });\n}\n\nfunction hasScope(file: string): boolean {\n  return file.match(/^@/) !== null;\n}\n\n/* eslint-disable no-async-promise-executor */\nexport async function findPackages(\n  storagePath: string,\n  validationHandler: Function\n): Promise<{ name: string; path: string }[]> {\n  const listPackages: { name: string; path: string }[] = [];\n  return new Promise(async (resolve, reject) => {\n    try {\n      const scopePath = path.resolve(storagePath);\n      const storageDirs = await readDirectory(scopePath);\n      for (const directory of storageDirs) {\n        // we check whether has 2nd level\n        if (hasScope(directory)) {\n          // we read directory multiple\n          const scopeDirectory = path.resolve(storagePath, directory);\n          const scopedPackages = await readDirectory(scopeDirectory);\n          for (const scopedDirName of scopedPackages) {\n            if (validationHandler(scopedDirName)) {\n              // we build the complete scope path\n              const scopePath = path.resolve(storagePath, directory, scopedDirName);\n              // list content of such directory\n              listPackages.push({\n                name: `${directory}/${scopedDirName}`,\n                path: scopePath,\n              });\n            }\n          }\n        } else {\n          // otherwise we read as single level\n          if (validationHandler(directory)) {\n            const scopePath = path.resolve(storagePath, directory);\n            listPackages.push({\n              name: directory,\n              path: scopePath,\n            });\n          }\n        }\n      }\n    } catch (error: any) {\n      reject(error);\n    }\n\n    resolve(listPackages);\n  });\n}\n\nexport function _dbGenPath(\n  dbName: string,\n  config: Pick<Config, 'config_path' | 'storage'>\n): string {\n  return path.join(\n    path.resolve(path.dirname(config.config_path || ''), config.storage as string, dbName)\n  );\n}\n"],"file":"utils.js"}

package/package.json

@@ -1,63 +1,73 @@
 {
-  "name": "@verdaccio/local-storage",
-  "version": "10.0.7",
-  "description": "Local storage implementation",
-  "keywords": [
-    "plugin",
-    "verdaccio",
-    "storage",
-    "local-storage"
-  ],
-  "author": "Juan Picado <juanpicado19@gmail.com>",
-  "license": "MIT",
-  "homepage": "https://verdaccio.org",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/verdaccio/monorepo",
-    "directory": "plugins/local-storage"
-  },
-  "bugs": {
-    "url": "https://github.com/verdaccio/monorepo/issues"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "files": [
-    "lib/"
-  ],
-  "engines": {
-    "node": ">=8"
-  },
-  "dependencies": {
-    "@verdaccio/commons-api": "10.0.1",
-    "@verdaccio/file-locking": "10.0.0",
-    "@verdaccio/streams": "10.0.0",
-    "async": "3.2.0",
-    "debug": "4.3.1",
-    "lodash": "4.17.21",
-    "lowdb": "1.0.0",
-    "mkdirp": "1.0.4"
-  },
-  "devDependencies": {
-    "@types/minimatch": "^3.0.3",
-    "@types/node": "^13.1.1",
-    "@verdaccio/types": "10.0.0",
-    "minimatch": "^3.0.4",
-    "rmdir-sync": "^1.0.1"
-  },
-  "funding": {
-    "type": "opencollective",
-    "url": "https://opencollective.com/verdaccio"
-  },
-  "scripts": {
-    "clean": "rimraf ./build",
-    "test": "cross-env NODE_ENV=test BABEL_ENV=test jest",
-    "type-check": "tsc --noEmit -p tsconfig.build.json",
-    "build:types": "tsc --emitDeclarationOnly -p tsconfig.build.json",
-    "build:js": "babel src/ --out-dir lib/ --copy-files --extensions \".ts,.tsx\" --source-maps",
-    "watch": "pnpm build:js -- --watch",
-    "build": "pnpm run build:js && pnpm run build:types"
-  }
-}
+	"name": "@verdaccio/local-storage",
+	"version": "11.0.0-6-next.9",
+	"description": "Local storage implementation",
+	"keywords": [
+		"private",
+		"package",
+		"repository",
+		"registry",
+		"enterprise",
+		"modules",
+		"proxy",
+		"server",
+		"verdaccio"
+	],
+	"author": "Juan Picado <juanpicado19@gmail.com>",
+	"license": "MIT",
+	"homepage": "https://verdaccio.org",
+	"repository": {
+		"type": "https",
+		"url": "https://github.com/verdaccio/verdaccio",
+		"directory": "packages/core/local-storage"
+	},
+	"bugs": {
+		"url": "https://github.com/verdaccio/verdaccio/issues"
+	},
+	"publishConfig": {
+		"access": "public"
+	},
+	"main": "./build/index.js",
+	"types": "./build/index.d.ts",
+	"files": [
+		"build/"
+	],
+	"engines": {
+		"node": ">=14",
+		"npm": ">=7"
+	},
+	"dependencies": {
+		"@verdaccio/core": "6.0.0-6-next.2",
+		"@verdaccio/file-locking": "11.0.0-6-next.4",
+		"@verdaccio/streams": "11.0.0-6-next.5",
+		"async": "3.2.1",
+		"core-js": "3.17.2",
+		"debug": "4.3.2",
+		"globby": "11.0.1",
+		"lockfile": "1.0.4",
+		"lodash": "4.17.21",
+		"lowdb": "1.0.0",
+		"lru-cache": "6.0.0"
+	},
+	"devDependencies": {
+		"@types/minimatch": "3.0.5",
+		"@verdaccio/types": "11.0.0-6-next.9",
+		"@verdaccio/config": "6.0.0-6-next.9",
+		"@verdaccio/utils": "6.0.0-6-next.7",
+		"minimatch": "3.0.4",
+		"tmp-promise": "3.0.2"
+	},
+	"funding": {
+		"type": "opencollective",
+		"url": "https://opencollective.com/verdaccio"
+	},
+	"scripts": {
+		"clean": "rimraf ./build",
+		"test": "cross-env NODE_ENV=test BABEL_ENV=test jest",
+		"type-check": "tsc --noEmit -p tsconfig.build.json",
+		"build:types": "tsc --emitDeclarationOnly -p tsconfig.build.json",
+		"build:js": "babel src/ --out-dir build/ --copy-files --extensions \".ts,.tsx\" --source-maps",
+		"watch": "pnpm build:js -- --watch",
+		"build": "pnpm run build:js && pnpm run build:types"
+	}
+}