@eik/core 1.3.12 → 1.3.14

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [1.3.14](https://github.com/eik-lib/core/compare/v1.3.13...v1.3.14) (2022-10-27)
+
+
+### Bug Fixes
+
+* Removed duplicate logger ([#340](https://github.com/eik-lib/core/issues/340)) ([808e160](https://github.com/eik-lib/core/commit/808e16079cd1a7616330488d837c3e84dc362cef))
+
+## [1.3.13](https://github.com/eik-lib/core/compare/v1.3.12...v1.3.13) (2022-10-18)
+
+
+### Bug Fixes
+
+* **deps:** update dependency ssri to v10 ([#337](https://github.com/eik-lib/core/issues/337)) ([b474833](https://github.com/eik-lib/core/commit/b474833838915e8b505aab84a39fed4a361c5ebc))
+* **deps:** update dependency unique-slug to v4 ([#336](https://github.com/eik-lib/core/issues/336)) ([bc2d673](https://github.com/eik-lib/core/commit/bc2d673cfaa150a10858bd452d91f76cffc4e0e5))
+
 ## [1.3.12](https://github.com/eik-lib/core/compare/v1.3.11...v1.3.12) (2022-10-05)
 
 

package/lib/classes/versions.js

@@ -25,9 +25,6 @@ const Versions = class Versions {
     }
 
     setVersion(version, integrity) {
-        if (!this.check(version)) {
-            throw new Error('Semver version is lower than previous version');
-        }
         const major = semver.major(version);
         this._versions.set(major, {
             version,

package/lib/handlers/map.get.js

@@ -22,7 +22,6 @@ const MapGet = class MapGet {
         this._sink = sink;
         this._etag = etag || config.etag;
         this._log = abslog(logger);
-
         this._metrics = new Metrics();
         this._histogram = this._metrics.histogram({
             name: 'eik_core_map_get_handler',

package/lib/handlers/map.put.js

@@ -31,7 +31,6 @@ const MapPut = class MapPut {
         this._cacheControl = cacheControl;
         this._sink = sink;
         this._log = abslog(logger);
-        this._log = abslog(logger);
         this._metrics = new Metrics();
         this._histogram = this._metrics.histogram({
             name: 'eik_core_map_put_handler',

package/lib/handlers/pkg.get.js

@@ -23,7 +23,6 @@ const PkgGet = class PkgGet {
         this._sink = sink;
         this._etag = etag || config.etag;
         this._log = abslog(logger);
-
         this._metrics = new Metrics();
         this._histogram = this._metrics.histogram({
             name: 'eik_core_pkg_get_handler',

package/lib/handlers/pkg.put.js

@@ -7,8 +7,9 @@ import abslog from 'abslog';
 import {
     createFilePathToPackage,
     createFilePathToVersion,
+    createFilePathToEikJson
 } from '../utils/path-builders-fs.js';
-import { decodeUriComponent, writeJSON, readJSON } from '../utils/utils.js';
+import { decodeUriComponent, writeJSON, readJSON, readEikJson } from '../utils/utils.js';
 import { createURIPathToPkgLog } from '../utils/path-builders-uri.js';
 import MultipartParser from '../multipart/parser.js';
 import HttpIncoming from '../classes/http-incoming.js';
@@ -118,6 +119,24 @@ const PkgPut = class PkgPut {
         return versions;
     }
 
+    async _readVersion(incoming) {
+        const path = createFilePathToEikJson(incoming);
+        try {
+            await readEikJson(this._sink, path);
+            this._log.info(
+                `pkg:put - Found version meta file from sink - Pathname: ${path}`,
+            );
+            return true;
+        } catch (error) {
+
+            // File does not exist, its probably a new package
+            this._log.info(
+                `pkg:put - Did not find meta file in sink - Create new - Pathname: ${path}`,
+            );
+            return false;
+        }
+    }
+
     async _writeVersions(incoming, versions) {
         const path = createFilePathToVersion(incoming);
         await writeJSON(this._sink, path, versions, 'application/json');
@@ -127,6 +146,7 @@ const PkgPut = class PkgPut {
     }
 
     async handler(req, user, type, name, version) {
+
         const end = this._histogram.timer();
 
         const pVersion = decodeUriComponent(version);
@@ -163,17 +183,18 @@ const PkgPut = class PkgPut {
             org,
         });
 
-        const versions = await this._readVersions(incoming);
+        const versionExists = await this._readVersion(incoming);
 
-        if (!versions.check(pVersion)) {
+        if (versionExists) {
             this._log.info(
-                `pkg:put - Semver version is lower than previous version of the package - Org: ${org} - Type: ${type} - Name: ${pName} - Version: ${pVersion}`,
+                `pkg:put - Semver version already exists for the package - Org: ${org} - Name: ${pName} - Version: ${pVersion}`,
             );
             const e = new HttpError.Conflict();
             end({ labels: { success: false, status: e.status, type } });
             throw e;
         }
 
+        const versions = await this._readVersions(incoming);
         const pkg = await this._parser(incoming);
         versions.setVersion(pVersion, pkg.integrity);
 

package/lib/handlers/versions.get.js

@@ -22,7 +22,6 @@ const VersionsGet = class VersionsGet {
         this._sink = sink;
         this._etag = etag || config.etag;
         this._log = abslog(logger);
-
         this._metrics = new Metrics();
         this._histogram = this._metrics.histogram({
             name: 'eik_core_versions_get_handler',

package/lib/utils/path-builders-fs.js

@@ -26,6 +26,8 @@ const createFilePathToAlias = ({ org = '', type = '', name = '', alias = '' } =
 
 const createFilePathToVersion = ({ org = '', type = '', name = '' } = {}) => path.join(globals.ROOT, org, type, name, 'versions.json')
 
+const createFilePathToEikJson = ({ org = '', type = '', name = '', version } = {}) => path.join(globals.ROOT, org, type, name, version, 'eik.json')
+
 const createFilePathToAliasOrigin = ({org = '', type = '', name = '', version = '',} = {}) => {
     if(type === 'map') {
         return createFilePathToImportMap({org, name, version})
@@ -41,4 +43,5 @@ export {
     createFilePathToAlias,
     createFilePathToVersion,
     createFilePathToAliasOrigin,
+    createFilePathToEikJson,
 }

package/lib/utils/utils.js

@@ -31,6 +31,8 @@ const readJSON = (sink, path) =>
     })
 ;
 
+const readEikJson = (sink, path) => sink.exist(path);
+
 const writeJSON = (sink, path, obj, contentType) => 
     // eslint-disable-next-line no-async-promise-executor
      new Promise(async (resolve, reject) => {
@@ -89,4 +91,5 @@ export {
     streamCollector,
     etagFromFsStat,
     decodeUriComponent,
+    readEikJson
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eik/core",
-  "version": "1.3.12",
+  "version": "1.3.14",
   "description": "Core server package",
   "main": "lib/main.js",
   "type": "module",
@@ -29,9 +29,9 @@
     "original-url": "1.2.3",
     "rimraf": "3.0.2",
     "semver": "7.3.8",
-    "ssri": "9.0.1",
+    "ssri": "10.0.0",
     "tar": "6.1.11",
-    "unique-slug": "2.0.2"
+    "unique-slug": "4.0.0"
   },
   "devDependencies": {
     "@babel/eslint-parser": "7.19.1",