verdaccio-stats 0.4.0 → 0.4.1

package/README.md

@@ -60,6 +60,20 @@ middlewares:
 
 Note: SQLite is the default database type, but for performance reason, it is not recommended for production use. For production, consider using MySQL, PostgreSQL, MariaDB, or MSSQL.
 
+You'll also need to ensure that the appropriate database driver is installed. For example, if you're using MySQL, you would need to install `mysql2`:
+
+```bash
+npm install -g mysql2
+```
+
+For other databases, install the corresponding driver:
+
+- PostgreSQL: `pg` and `pg-hstore`
+- MariaDB: `mariadb`
+- MSSQL: `tedious`
+- SQLite: `sqlite3` (not recommended for production)
+- Oracle: `oracledb`
+
 ### Configuration Options
 
 | Option                 | Type             | Default           | Description                                                       |

package/lib/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var node_module = require('node:module');
+var ms = require('ms');
 var zod = require('zod');
 var path = require('node:path');
 var dayjs = require('dayjs');
@@ -12,14 +12,12 @@ var weekOfYear = require('dayjs/plugin/weekOfYear');
 var weekYear = require('dayjs/plugin/weekYear');
 var buildDebug = require('debug');
 var core = require('@verdaccio/core');
-var tslib = require('tslib');
 var sequelizeTypescript = require('sequelize-typescript');
 var sequelize = require('sequelize');
 var umzug = require('umzug');
 
-var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 var name = "verdaccio-stats";
-var version = "0.4.0";
+var version = "0.4.1";
 
 const plugin = {
     name,
@@ -148,8 +146,6 @@ async function interopDefault(m) {
     return resolved.default ?? resolved;
 }
 
-const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.js', document.baseURI).href)));
-const ms = require$1("ms");
 const statsConfig = zod.z
     .object({
     dialect: zod.z
@@ -212,7 +208,7 @@ const statsConfig = zod.z
         const parsed = ms(flushInterval);
         if (typeof parsed !== "number" || !Number.isFinite(parsed) || parsed < 0) {
             ctx.addIssue({
-                code: zod.z.ZodIssueCode.custom,
+                code: "custom",
                 message: "Flush interval must be a valid duration string or a non-negative number (ms)",
                 path: ["flush-interval"],
             });
@@ -221,7 +217,7 @@ const statsConfig = zod.z
     if (data.dialect === "sqlite") {
         if (typeof data.database !== "string" || !data.database) {
             ctx.addIssue({
-                code: zod.z.ZodIssueCode.custom,
+                code: "custom",
                 message: "SQLite storage path is required and must be a non-empty string",
                 path: ["storage"],
             });
@@ -232,7 +228,7 @@ const statsConfig = zod.z
             for (const key of ["name", "username", "password", "host", "port"]) {
                 if (!data.database[key]) {
                     ctx.addIssue({
-                        code: zod.z.ZodIssueCode.custom,
+                        code: "custom",
                         message: `Database ${key} is required for non-SQLite dialects`,
                         path: ["database", key],
                     });
@@ -241,7 +237,7 @@ const statsConfig = zod.z
         }
         else {
             ctx.addIssue({
-                code: zod.z.ZodIssueCode.custom,
+                code: "custom",
                 message: "Database configuration is required for non-SQLite dialects",
                 path: ["database"],
             });
@@ -258,8 +254,12 @@ class ParsedPluginConfig {
             this.config = statsConfig.parse(config);
         }
         catch (err) {
-            const fieldErrors = err.flatten().fieldErrors;
-            logger.error({ errors: fieldErrors }, "Invalid config for verdaccio stats plugin, @{errors}");
+            const flattened = zod.z.flattenError(err);
+            const errorMessages = [
+                ...flattened.formErrors,
+                ...Object.entries(flattened.fieldErrors).flatMap(([key, errs]) => (errs ?? []).map((e) => `[${key}] ${e}`)),
+            ];
+            logger.error({ errors: errorMessages.join("\n") }, "Invalid config for verdaccio stats plugin:\n@{errors}");
             process.exit(1);
         }
     }
@@ -419,48 +419,81 @@ class Stats {
     };
 }
 
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+/* global Reflect, Promise, SuppressedError, Symbol, Iterator */
+
+
+function __decorate(decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+
+function __metadata(metadataKey, metadataValue) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
+
 class StatsModel extends sequelizeTypescript.Model {
 }
-tslib.__decorate([
+__decorate([
     sequelizeTypescript.Column({
         type: sequelizeTypescript.DataType.INTEGER,
         allowNull: false,
         defaultValue: 0,
     }),
-    tslib.__metadata("design:type", Number)
+    __metadata("design:type", Number)
 ], StatsModel.prototype, "count", void 0);
-tslib.__decorate([
+__decorate([
     sequelizeTypescript.ForeignKey(() => Package),
     sequelizeTypescript.Column({
         type: sequelizeTypescript.DataType.INTEGER,
         allowNull: false,
     }),
-    tslib.__metadata("design:type", Number)
+    __metadata("design:type", Number)
 ], StatsModel.prototype, "packageId", void 0);
-tslib.__decorate([
+__decorate([
     sequelizeTypescript.Column({
         type: sequelizeTypescript.DataType.STRING(20),
         allowNull: false,
     }),
-    tslib.__metadata("design:type", String)
+    __metadata("design:type", String)
 ], StatsModel.prototype, "periodType", void 0);
-tslib.__decorate([
+__decorate([
     sequelizeTypescript.Column({
         type: sequelizeTypescript.DataType.STRING(20),
         allowNull: false,
     }),
-    tslib.__metadata("design:type", String)
+    __metadata("design:type", String)
 ], StatsModel.prototype, "periodValue", void 0);
-tslib.__decorate([
+__decorate([
     sequelizeTypescript.BelongsTo(() => Package, {
         targetKey: "id",
         foreignKey: "packageId",
     }),
-    tslib.__metadata("design:type", Object)
+    __metadata("design:type", Object)
 ], StatsModel.prototype, "package", void 0);
 let DownloadStats = class DownloadStats extends StatsModel {
 };
-DownloadStats = tslib.__decorate([
+DownloadStats = __decorate([
     sequelizeTypescript.Table({
         tableName: "download_stats",
         timestamps: true,
@@ -475,7 +508,7 @@ DownloadStats = tslib.__decorate([
 ], DownloadStats);
 let ManifestViewStats = class ManifestViewStats extends StatsModel {
 };
-ManifestViewStats = tslib.__decorate([
+ManifestViewStats = __decorate([
     sequelizeTypescript.Table({
         tableName: "manifest_view_stats",
         timestamps: true,
@@ -494,34 +527,34 @@ let Package = class Package extends sequelizeTypescript.Model {
         return `${this.getDataValue("name")}@${this.getDataValue("version")}`;
     }
 };
-tslib.__decorate([
+__decorate([
     sequelizeTypescript.Column({
         type: sequelizeTypescript.DataType.STRING(100),
         allowNull: false,
     }),
-    tslib.__metadata("design:type", String)
+    __metadata("design:type", String)
 ], Package.prototype, "name", void 0);
-tslib.__decorate([
+__decorate([
     sequelizeTypescript.Column({
         type: sequelizeTypescript.DataType.STRING(50),
         allowNull: false,
     }),
-    tslib.__metadata("design:type", String)
+    __metadata("design:type", String)
 ], Package.prototype, "version", void 0);
-tslib.__decorate([
+__decorate([
     sequelizeTypescript.Column(sequelizeTypescript.DataType.VIRTUAL(sequelizeTypescript.DataType.STRING, ["name", "version"])),
-    tslib.__metadata("design:type", Object),
-    tslib.__metadata("design:paramtypes", [])
+    __metadata("design:type", Object),
+    __metadata("design:paramtypes", [])
 ], Package.prototype, "displayName", null);
-tslib.__decorate([
+__decorate([
     sequelizeTypescript.HasMany(() => DownloadStats, { sourceKey: "id", foreignKey: "packageId" }),
-    tslib.__metadata("design:type", Object)
+    __metadata("design:type", Object)
 ], Package.prototype, "downloadStats", void 0);
-tslib.__decorate([
+__decorate([
     sequelizeTypescript.HasMany(() => ManifestViewStats, { sourceKey: "id", foreignKey: "packageId" }),
-    tslib.__metadata("design:type", Object)
+    __metadata("design:type", Object)
 ], Package.prototype, "manifestViewStats", void 0);
-Package = tslib.__decorate([
+Package = __decorate([
     sequelizeTypescript.Table({
         tableName: "packages",
         timestamps: true,

package/lib/index.mjs

@@ -1,4 +1,4 @@
-import { createRequire } from 'node:module';
+import ms from 'ms';
 import { z } from 'zod';
 import path from 'node:path';
 import dayjs, { extend } from 'dayjs';
@@ -8,13 +8,12 @@ import weekOfYear from 'dayjs/plugin/weekOfYear';
 import weekYear from 'dayjs/plugin/weekYear';
 import buildDebug from 'debug';
 import { tarballUtils } from '@verdaccio/core';
-import { __decorate, __metadata } from 'tslib';
 import { Column, DataType, ForeignKey, BelongsTo, Table, Model, HasMany, Sequelize } from 'sequelize-typescript';
 import { Op } from 'sequelize';
 import { Umzug, SequelizeStorage } from 'umzug';
 
 var name = "verdaccio-stats";
-var version = "0.4.0";
+var version = "0.4.1";
 
 const plugin = {
     name,
@@ -143,8 +142,6 @@ async function interopDefault(m) {
     return resolved.default ?? resolved;
 }
 
-const require$1 = createRequire(import.meta.url);
-const ms = require$1("ms");
 const statsConfig = z
     .object({
     dialect: z
@@ -207,7 +204,7 @@ const statsConfig = z
         const parsed = ms(flushInterval);
         if (typeof parsed !== "number" || !Number.isFinite(parsed) || parsed < 0) {
             ctx.addIssue({
-                code: z.ZodIssueCode.custom,
+                code: "custom",
                 message: "Flush interval must be a valid duration string or a non-negative number (ms)",
                 path: ["flush-interval"],
             });
@@ -216,7 +213,7 @@ const statsConfig = z
     if (data.dialect === "sqlite") {
         if (typeof data.database !== "string" || !data.database) {
             ctx.addIssue({
-                code: z.ZodIssueCode.custom,
+                code: "custom",
                 message: "SQLite storage path is required and must be a non-empty string",
                 path: ["storage"],
             });
@@ -227,7 +224,7 @@ const statsConfig = z
             for (const key of ["name", "username", "password", "host", "port"]) {
                 if (!data.database[key]) {
                     ctx.addIssue({
-                        code: z.ZodIssueCode.custom,
+                        code: "custom",
                         message: `Database ${key} is required for non-SQLite dialects`,
                         path: ["database", key],
                     });
@@ -236,7 +233,7 @@ const statsConfig = z
         }
         else {
             ctx.addIssue({
-                code: z.ZodIssueCode.custom,
+                code: "custom",
                 message: "Database configuration is required for non-SQLite dialects",
                 path: ["database"],
             });
@@ -253,8 +250,12 @@ class ParsedPluginConfig {
             this.config = statsConfig.parse(config);
         }
         catch (err) {
-            const fieldErrors = err.flatten().fieldErrors;
-            logger.error({ errors: fieldErrors }, "Invalid config for verdaccio stats plugin, @{errors}");
+            const flattened = z.flattenError(err);
+            const errorMessages = [
+                ...flattened.formErrors,
+                ...Object.entries(flattened.fieldErrors).flatMap(([key, errs]) => (errs ?? []).map((e) => `[${key}] ${e}`)),
+            ];
+            logger.error({ errors: errorMessages.join("\n") }, "Invalid config for verdaccio stats plugin:\n@{errors}");
             process.exit(1);
         }
     }
@@ -414,6 +415,39 @@ class Stats {
     };
 }
 
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+/* global Reflect, Promise, SuppressedError, Symbol, Iterator */
+
+
+function __decorate(decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+
+function __metadata(metadataKey, metadataValue) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
+
 class StatsModel extends Model {
 }
 __decorate([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "verdaccio-stats",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "The stats plugin for Verdaccio",
   "main": "./lib/index.js",
   "module": "./lib/index.mjs",
@@ -17,18 +17,19 @@
   "author": "Xingwang Liao<kuoruan@gmail.com>",
   "license": "MIT",
   "devDependencies": {
-    "@eslint/js": "^9.39.2",
+    "@eslint/js": "^9.39.3",
     "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-replace": "^6.0.3",
     "@rollup/plugin-typescript": "^12.3.0",
+    "@tsconfig/node18": "^18.2.6",
     "@types/debug": "^4.1.12",
     "@types/express": "^4.17.25",
     "@types/ms": "^2.1.0",
     "@verdaccio/types": "13.0.0-next-8.10",
     "cross-env": "^10.1.0",
-    "eslint": "^9.39.2",
+    "eslint": "^9.39.3",
     "eslint-config-prettier": "^10.1.8",
     "eslint-import-resolver-next": "^0.6.0",
     "eslint-plugin-import-x": "^4.16.1",
@@ -37,17 +38,17 @@
     "eslint-plugin-unicorn": "^63.0.0",
     "express": "^4.22.1",
     "globals": "^17.3.0",
-    "pg": "^8.18.0",
+    "pg": "^8.19.0",
     "pg-hstore": "^2.3.4",
     "prettier": "^3.8.1",
-    "rimraf": "^6.1.2",
-    "rollup": "^4.57.1",
+    "rimraf": "^6.1.3",
+    "rollup": "^4.59.0",
     "rollup-plugin-node-externals": "^8.1.2",
     "sqlite3": "^5.1.7",
     "tslib": "^2.8.1",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.55.0",
-    "verdaccio": "^6.2.5",
+    "typescript-eslint": "^8.56.1",
+    "verdaccio": "^6.2.9",
     "verdaccio-stats": "file:",
     "vitest": "^4.0.18"
   },
@@ -60,7 +61,7 @@
   "dependencies": {
     "@adminjs/express": "^6.1.1",
     "@adminjs/sequelize": "^4.1.1",
-    "@verdaccio/core": "8.0.0-next-8.29",
+    "@verdaccio/core": "8.0.0-next-8.30",
     "adminjs": "^7.8.17",
     "dayjs": "^1.11.19",
     "debug": "^4.4.3",