@hestia-earth/api 0.27.6 → 0.27.7

package/esm/files/model/llm-preset.js

@@ -1,4 +1,3 @@
-import { throwError } from '../../errors.js';
 export var LlmEngine;
 (function (LlmEngine) {
     LlmEngine["claude"] = "claude";
@@ -29,7 +28,9 @@ const engines = Object.values(LlmEngine);
 const isEngine = (value) => engines.includes(value);
 const isReviewer = (value) => typeof value === 'string' && value.length > 0 && isEngine(value.split(':')[0]);
 const isStringRecord = (value) => !!value && typeof value === 'object' && !Array.isArray(value);
-const invalid = (reason) => throwError('invalid-llm-presets', { reason });
+const invalid = (reason) => {
+    throw new Error(reason);
+};
 const validateEngine = (field, value) => (value === undefined || isEngine(value)) || invalid(`invalid ${field} "${value}"`);
 const validateOptionalString = (field, value) => (value === undefined || typeof value === 'string') || invalid(`${field} must be a string`);
 const validateOptionalBoolean = (field, value) => (value === undefined || typeof value === 'boolean') || invalid(`${field} must be a boolean`);

package/files/model/llm-preset.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateLlmPresets = exports.stripPresetSecrets = exports.llmApiKeys = exports.LlmApiKey = exports.LlmEngine = void 0;
-const errors_1 = require("../../errors");
 var LlmEngine;
 (function (LlmEngine) {
     LlmEngine["claude"] = "claude";
@@ -33,7 +32,9 @@ const engines = Object.values(LlmEngine);
 const isEngine = (value) => engines.includes(value);
 const isReviewer = (value) => typeof value === 'string' && value.length > 0 && isEngine(value.split(':')[0]);
 const isStringRecord = (value) => !!value && typeof value === 'object' && !Array.isArray(value);
-const invalid = (reason) => (0, errors_1.throwError)('invalid-llm-presets', { reason });
+const invalid = (reason) => {
+    throw new Error(reason);
+};
 const validateEngine = (field, value) => (value === undefined || isEngine(value)) || invalid(`invalid ${field} "${value}"`);
 const validateOptionalString = (field, value) => (value === undefined || typeof value === 'string') || invalid(`${field} must be a string`);
 const validateOptionalBoolean = (field, value) => (value === undefined || typeof value === 'boolean') || invalid(`${field} must be a boolean`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/api",
-  "version": "0.27.6",
+  "version": "0.27.7",
   "description": "Hestia API definitions",
   "main": "models.js",
   "module": "esm/models.js",

package/reconciliations/model/validations.d.ts

@@ -9,4 +9,4 @@ export declare const validateExpectedNodes: (nodes: Node[]) => string[];
 export declare const validateImpactAssessmentLinks: (nodes: Node[]) => string[];
 export declare const validatePrivate: (cycle: ICycleJSONLD) => string[];
 export declare const validateProductCorrespondence: (expectedProducts: (ITermJSONLD | Term)[], recalculatedProducts: (ITermJSONLD | Term)[], idRecalculated: string) => string[];
-export declare const getMainErrorMessage: (errors: any) => "recalculation-error" | "invalid-nodes" | "expected-not-private";
+export declare const getMainErrorMessage: (errors: any) => "expected-not-private" | "recalculation-error" | "invalid-nodes";

package/errors.d.ts

@@ -1,40 +0,0 @@
-import { Express, Request, Response, NextFunction } from 'express';
-import { NextHandleFunction } from 'connect';
-export declare enum Errors {
-    UnderMaintenance = "under-maintenance",
-    ReadOnly = "read-only",
-    InvalidQueryParam = "invalid-param-query",
-    MissingQueryParam = "missing-param-query",
-    InvalidBodyParam = "invalid-param-body",
-    MissingBodyParam = "missing-param-body",
-    MissingHeaderParam = "missing-param-header",
-    SchemaInvalid = "invalid-schema",
-    NotFound = "not-found",
-    Unauthorized = "Unauthorized",
-    BadRequest = "bad-request",
-    FilesLocked = "files-locked"
-}
-export declare enum StatusCodes {
-    BadRequest = 400,
-    Unauthorized = 401,
-    Forbidden = 403,
-    NotFound = 404,
-    MethodNotAllowed = 405,
-    Conflict = 409,
-    RateLimit = 429,
-    ServiceUnavailable = 503,
-    InternalServerError = 500
-}
-export declare class HestiaError extends Error {
-    details: {};
-    statusCode?: StatusCodes;
-    constructor(message: string, details?: {}, statusCode?: StatusCodes);
-}
-export declare const throwError: (message: string, details?: any, statusCode?: StatusCodes) => never;
-export declare const isRecalculationError: (e: any) => boolean;
-export declare const shouldHandleError: (error: Error) => boolean;
-export declare const errorMessage: (error?: Error) => string;
-export declare const errorHandler: (err: any, _r: Request, res: Response, _n?: NextFunction) => Response<any, Record<string, any>>;
-export declare const handleSyntaxError: (middleware: NextHandleFunction) => (req: Request, res: Response, next: NextFunction) => void;
-declare const _default: (app: Express) => void;
-export default _default;

package/errors.js

@@ -1,87 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleSyntaxError = exports.errorHandler = exports.errorMessage = exports.shouldHandleError = exports.isRecalculationError = exports.throwError = exports.HestiaError = exports.StatusCodes = exports.Errors = void 0;
-const Sentry = require("@sentry/node");
-const pick = require('lodash.pick');
-const logger_1 = require("./logger");
-var Errors;
-(function (Errors) {
-    Errors["UnderMaintenance"] = "under-maintenance";
-    Errors["ReadOnly"] = "read-only";
-    Errors["InvalidQueryParam"] = "invalid-param-query";
-    Errors["MissingQueryParam"] = "missing-param-query";
-    Errors["InvalidBodyParam"] = "invalid-param-body";
-    Errors["MissingBodyParam"] = "missing-param-body";
-    Errors["MissingHeaderParam"] = "missing-param-header";
-    Errors["SchemaInvalid"] = "invalid-schema";
-    Errors["NotFound"] = "not-found";
-    Errors["Unauthorized"] = "Unauthorized";
-    Errors["BadRequest"] = "bad-request";
-    Errors["FilesLocked"] = "files-locked";
-})(Errors || (exports.Errors = Errors = {}));
-var StatusCodes;
-(function (StatusCodes) {
-    StatusCodes[StatusCodes["BadRequest"] = 400] = "BadRequest";
-    StatusCodes[StatusCodes["Unauthorized"] = 401] = "Unauthorized";
-    StatusCodes[StatusCodes["Forbidden"] = 403] = "Forbidden";
-    StatusCodes[StatusCodes["NotFound"] = 404] = "NotFound";
-    StatusCodes[StatusCodes["MethodNotAllowed"] = 405] = "MethodNotAllowed";
-    StatusCodes[StatusCodes["Conflict"] = 409] = "Conflict";
-    StatusCodes[StatusCodes["RateLimit"] = 429] = "RateLimit";
-    StatusCodes[StatusCodes["ServiceUnavailable"] = 503] = "ServiceUnavailable";
-    StatusCodes[StatusCodes["InternalServerError"] = 500] = "InternalServerError";
-})(StatusCodes || (exports.StatusCodes = StatusCodes = {}));
-class HestiaError extends Error {
-    details;
-    statusCode;
-    constructor(message, details = {}, statusCode) {
-        super(message);
-        this.details = details;
-        this.statusCode = statusCode;
-        this.name = 'HestiaError';
-    }
-}
-exports.HestiaError = HestiaError;
-const throwError = (message, details, statusCode) => {
-    throw new HestiaError(message, details, statusCode);
-};
-exports.throwError = throwError;
-const isHestiaError = (error) => error.name === 'HestiaError';
-const isRecalculationError = e => ['recalculation-error', 'invalid-nodes'].includes(e.message);
-exports.isRecalculationError = isRecalculationError;
-const shouldHandleError = (error) => !isHestiaError(error);
-exports.shouldHandleError = shouldHandleError;
-const statusCode = (error) => error.statusCode ||
-    ((0, exports.errorMessage)(error).includes(Errors.NotFound)
-        ? StatusCodes.NotFound
-        : error.message === Errors.Unauthorized
-            ? StatusCodes.Unauthorized
-            : isHestiaError(error)
-                ? StatusCodes.BadRequest
-                : StatusCodes.InternalServerError);
-const errorMessage = (error) => error?.message || 'There was an error processing your request.';
-exports.errorMessage = errorMessage;
-const errorHandler = (err, _r, res, _n) => {
-    const unexpectedError = (0, exports.shouldHandleError)(err);
-    unexpectedError && logger_1.logger.error(err.stack ? err.stack : err);
-    const message = (0, exports.errorMessage)(err);
-    res.statusCode = statusCode(err);
-    return res.json({
-        message,
-        ...pick(err, ['details', 'oauthError'])
-    });
-};
-exports.errorHandler = errorHandler;
-const handleSyntaxError = (middleware) => (req, res, next) => middleware(req, res, err => {
-    if (err instanceof SyntaxError) {
-        const message = (0, exports.errorMessage)(err);
-        res.statusCode = 400;
-        return res.json({ message });
-    }
-    next();
-});
-exports.handleSyntaxError = handleSyntaxError;
-exports.default = (app) => {
-    app.use(Sentry.Handlers.errorHandler({ shouldHandleError: exports.shouldHandleError }));
-    app.use(exports.errorHandler);
-};

package/esm/errors.js

@@ -1,77 +0,0 @@
-import * as Sentry from '@sentry/node';
-const pick = require('lodash.pick');
-import { logger } from './logger.js';
-export var Errors;
-(function (Errors) {
-    Errors["UnderMaintenance"] = "under-maintenance";
-    Errors["ReadOnly"] = "read-only";
-    Errors["InvalidQueryParam"] = "invalid-param-query";
-    Errors["MissingQueryParam"] = "missing-param-query";
-    Errors["InvalidBodyParam"] = "invalid-param-body";
-    Errors["MissingBodyParam"] = "missing-param-body";
-    Errors["MissingHeaderParam"] = "missing-param-header";
-    Errors["SchemaInvalid"] = "invalid-schema";
-    Errors["NotFound"] = "not-found";
-    Errors["Unauthorized"] = "Unauthorized";
-    Errors["BadRequest"] = "bad-request";
-    Errors["FilesLocked"] = "files-locked";
-})(Errors || (Errors = {}));
-export var StatusCodes;
-(function (StatusCodes) {
-    StatusCodes[StatusCodes["BadRequest"] = 400] = "BadRequest";
-    StatusCodes[StatusCodes["Unauthorized"] = 401] = "Unauthorized";
-    StatusCodes[StatusCodes["Forbidden"] = 403] = "Forbidden";
-    StatusCodes[StatusCodes["NotFound"] = 404] = "NotFound";
-    StatusCodes[StatusCodes["MethodNotAllowed"] = 405] = "MethodNotAllowed";
-    StatusCodes[StatusCodes["Conflict"] = 409] = "Conflict";
-    StatusCodes[StatusCodes["RateLimit"] = 429] = "RateLimit";
-    StatusCodes[StatusCodes["ServiceUnavailable"] = 503] = "ServiceUnavailable";
-    StatusCodes[StatusCodes["InternalServerError"] = 500] = "InternalServerError";
-})(StatusCodes || (StatusCodes = {}));
-export class HestiaError extends Error {
-    details;
-    statusCode;
-    constructor(message, details = {}, statusCode) {
-        super(message);
-        this.details = details;
-        this.statusCode = statusCode;
-        this.name = 'HestiaError';
-    }
-}
-export const throwError = (message, details, statusCode) => {
-    throw new HestiaError(message, details, statusCode);
-};
-const isHestiaError = (error) => error.name === 'HestiaError';
-export const isRecalculationError = e => ['recalculation-error', 'invalid-nodes'].includes(e.message);
-export const shouldHandleError = (error) => !isHestiaError(error);
-const statusCode = (error) => error.statusCode ||
-    (errorMessage(error).includes(Errors.NotFound)
-        ? StatusCodes.NotFound
-        : error.message === Errors.Unauthorized
-            ? StatusCodes.Unauthorized
-            : isHestiaError(error)
-                ? StatusCodes.BadRequest
-                : StatusCodes.InternalServerError);
-export const errorMessage = (error) => error?.message || 'There was an error processing your request.';
-export const errorHandler = (err, _r, res, _n) => {
-    const unexpectedError = shouldHandleError(err);
-    unexpectedError && logger.error(err.stack ? err.stack : err);
-    const message = errorMessage(err);
-    res.statusCode = statusCode(err);
-    return res.json({
-        message,
-        ...pick(err, ['details', 'oauthError'])
-    });
-};
-export const handleSyntaxError = (middleware) => (req, res, next) => middleware(req, res, err => {
-    if (err instanceof SyntaxError) {
-        const message = errorMessage(err);
-        res.statusCode = 400;
-        return res.json({ message });
-    }
-    next();
-});
-export default (app) => {
-    app.use(Sentry.Handlers.errorHandler({ shouldHandleError }));
-    app.use(errorHandler);
-};

package/esm/logger.js

@@ -1,31 +0,0 @@
-import { createLogger, format, transports } from 'winston';
-const { combine, timestamp, json } = format;
-const logFilename = process.env.LOG_FILENAME;
-const handleExceptions = process.env.NODE_ENV !== 'test';
-const options = {
-    file: {
-        level: (process.env.LOG_LEVEL || 'info').toLowerCase(),
-        filename: logFilename,
-        handleExceptions,
-        json: true,
-        maxsize: 5242880,
-        maxFiles: 5,
-        colorize: false
-    },
-    console: {
-        level: 'debug',
-        handleExceptions,
-        json: false,
-        colorize: true
-    }
-};
-export const logger = createLogger({
-    format: combine(timestamp(), json()),
-    transports: [...(logFilename ? [new transports.File(options.file)] : []), new transports.Console(options.console)],
-    exitOnError: false
-});
-export const stream = {
-    write: message => {
-        logger.info(message);
-    }
-};

package/logger.d.ts

@@ -1,4 +0,0 @@
-export declare const logger: import("winston").Logger;
-export declare const stream: {
-    write: (message: any) => void;
-};

package/logger.js

@@ -1,34 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.stream = exports.logger = void 0;
-const winston_1 = require("winston");
-const { combine, timestamp, json } = winston_1.format;
-const logFilename = process.env.LOG_FILENAME;
-const handleExceptions = process.env.NODE_ENV !== 'test';
-const options = {
-    file: {
-        level: (process.env.LOG_LEVEL || 'info').toLowerCase(),
-        filename: logFilename,
-        handleExceptions,
-        json: true,
-        maxsize: 5242880,
-        maxFiles: 5,
-        colorize: false
-    },
-    console: {
-        level: 'debug',
-        handleExceptions,
-        json: false,
-        colorize: true
-    }
-};
-exports.logger = (0, winston_1.createLogger)({
-    format: combine(timestamp(), json()),
-    transports: [...(logFilename ? [new winston_1.transports.File(options.file)] : []), new winston_1.transports.Console(options.console)],
-    exitOnError: false
-});
-exports.stream = {
-    write: message => {
-        exports.logger.info(message);
-    }
-};