@vereign/core 1.6.1 → 1.7.0

package/dist/{index.mjs → index.cjs}

@@ -1,5 +1,10 @@
+"use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -14,6 +19,27 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -36,10 +62,15 @@ var __async = (__this, __arguments, generator) => {
 };
 
 // src/index.ts
-import express3 from "express";
+var index_exports = {};
+__export(index_exports, {
+  App: () => App
+});
+module.exports = __toCommonJS(index_exports);
+var import_express3 = __toESM(require("express"), 1);
 
 // src/health/router.ts
-import express from "express";
+var import_express = __toESM(require("express"), 1);
 
 // src/health/controller.ts
 var HealthController = class {
@@ -56,7 +87,7 @@ var HealthController = class {
 // src/health/router.ts
 var HealthRouter = class {
   static getRouter(logger, appVersion) {
-    const router = express.Router();
+    const router = import_express.default.Router();
     const controller = new HealthController(logger, appVersion);
     router.get("/health", controller.check);
     return router;
@@ -64,14 +95,14 @@ var HealthRouter = class {
 };
 
 // src/chmed16/router.ts
-import express2 from "express";
+var import_express2 = __toESM(require("express"), 1);
 
 // src/chmed16/controller.ts
-import { CHMEDParser, SDS, ConformanceError } from "@vereign/chmed-parser";
-import { PDFLib } from "@vereign/pdf-generator";
+var import_chmed_parser = require("@vereign/chmed-parser");
+var import_pdf_generator = require("@vereign/pdf-generator");
 
 // src/app-error.ts
-import * as z from "zod/v4";
+var z = __toESM(require("zod/v4"), 1);
 var AppError = class extends Error {
   constructor(status, message, code, details) {
     super(message);
@@ -102,7 +133,7 @@ var appErrorSchema = z.object({
 
 // src/chmed16/controller.ts
 var CHMED16AController = class {
-  constructor(logger) {
+  constructor(logger, appVersion, clientId) {
     this.process = (req, res, next) => __async(this, null, function* () {
       const { chmed, lang } = req.body;
       const token = req.token;
@@ -117,8 +148,13 @@ var CHMED16AController = class {
       }
     });
     this.logger = logger;
-    this.sds = new SDS("https://sds-test.hin.ch", logger);
-    this.parser = new CHMEDParser(logger);
+    this.sds = new import_chmed_parser.SDS(
+      "https://oauth2.sds.hin.ch",
+      logger,
+      appVersion,
+      clientId
+    );
+    this.parser = new import_chmed_parser.CHMEDParser(logger);
   }
   parseChmedData(chmed, token, lang) {
     return __async(this, null, function* () {
@@ -130,7 +166,7 @@ var CHMED16AController = class {
         return json;
       } catch (error) {
         this.logger.error("Parsing failed:", error);
-        if (error instanceof ConformanceError) {
+        if (error instanceof import_chmed_parser.ConformanceError) {
           throw new AppError(
             400,
             "CHMED data does not conform to required standards.",
@@ -138,6 +174,32 @@ var CHMED16AController = class {
             error.validationErrors
           );
         }
+        if (error instanceof import_chmed_parser.UpgradeError) {
+          throw new AppError(426, "Upgrade required.", "UPGRADE_ERROR");
+        }
+        if (error instanceof import_chmed_parser.DoctorNotFoundError) {
+          throw new AppError(400, "Failed to fetch doctor by gln", "NOT_FOUND", [
+            {
+              path: "chmed",
+              message: error.message,
+              code: "doctor_not_found"
+            }
+          ]);
+        }
+        if (error instanceof import_chmed_parser.UnauthorizedError) {
+          throw new AppError(
+            401,
+            "Unauthorized access. Check the bearer token.",
+            "UNAUTHORIZED_ERROR",
+            [
+              {
+                path: "chmed",
+                message: error.message,
+                code: "unauthorized_access"
+              }
+            ]
+          );
+        }
         throw new AppError(
           400,
           "Failed to parse CHMED data. Please check the input format.",
@@ -157,7 +219,7 @@ var CHMED16AController = class {
     return __async(this, null, function* () {
       const pdfStart = Date.now();
       try {
-        const pdf = new PDFLib(this.logger);
+        const pdf = new import_pdf_generator.PDFLib(this.logger);
         const pdfBuffer = yield pdf.generateBuffer(json);
         res.setHeader("Content-Type", "application/pdf");
         res.setHeader("Content-Disposition", 'inline; filename="chmed16a.pdf"');
@@ -183,10 +245,10 @@ var CHMED16AController = class {
 };
 
 // src/chmed16/middleware.ts
-import { ZodError } from "zod";
+var import_zod = require("zod");
 
 // src/chmed16/request.ts
-import * as z2 from "zod/v4";
+var z2 = __toESM(require("zod/v4"), 1);
 var chmedPattern = /^CHMED[0-9A-Za-z]+/;
 var bodySchema = z2.object({
   chmed: z2.string().min(5, "string is required").refine(
@@ -217,7 +279,7 @@ var validateBody = (logger) => {
       next();
     } catch (e) {
       logger.debug("Body validation failed", { error: e });
-      if (e instanceof ZodError) {
+      if (e instanceof import_zod.ZodError) {
         const details = e.issues.map((err) => ({
           path: err.path.join("."),
           message: err.message,
@@ -278,9 +340,9 @@ var validateBearerToken = (logger) => {
 
 // src/chmed16/router.ts
 var CHMED16ARouter = class {
-  static getRouter(logger) {
-    const router = express2.Router();
-    const controller = new CHMED16AController(logger);
+  static getRouter(logger, appVersion, clientId) {
+    const router = import_express2.default.Router();
+    const controller = new CHMED16AController(logger, appVersion, clientId);
     router.post(
       "/chmed",
       validateBearerToken(logger),
@@ -292,18 +354,19 @@ var CHMED16ARouter = class {
 };
 
 // src/index.ts
-import { ZodError as ZodError2 } from "zod";
+var import_zod2 = require("zod");
 var App = class {
   constructor(logger, appVersion) {
     this.logger = logger;
     this.appVersion = appVersion;
-    this.app = express3();
+    this.clientId = crypto.randomUUID();
+    this.app = (0, import_express3.default)();
     this.initializeMiddlewares();
     this.initializeRoutes();
     this.initializeErrorHandling();
   }
   initializeMiddlewares() {
-    this.app.use(express3.json());
+    this.app.use(import_express3.default.json());
     this.app.use((req, res, next) => {
       this.logger.info(`${req.method} ${req.url}`);
       next();
@@ -311,7 +374,10 @@ var App = class {
   }
   initializeRoutes() {
     this.app.use("/", HealthRouter.getRouter(this.logger, this.appVersion));
-    this.app.use("/v1", CHMED16ARouter.getRouter(this.logger));
+    this.app.use(
+      "/v1",
+      CHMED16ARouter.getRouter(this.logger, this.appVersion, this.clientId)
+    );
   }
   /**
    * General error handler for all errors, so we can throw from anywhere in the project
@@ -322,7 +388,7 @@ var App = class {
       (e, req, res, next) => {
         this.logger.debug("General Error Handler");
         this.logger.debug(e);
-        if (e instanceof ZodError2) {
+        if (e instanceof import_zod2.ZodError) {
           const details = e.issues.map((err) => ({
             path: err.path.join("."),
             message: err.message,
@@ -366,6 +432,7 @@ var App = class {
     });
   }
 };
-export {
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
   App
-};
+});

package/dist/{index.d.mts → index.d.cts}

@@ -5,6 +5,7 @@ declare class App {
     private logger;
     private appVersion;
     app: Express;
+    clientId: string;
     constructor(logger: Logger, appVersion: string);
     private initializeMiddlewares;
     private initializeRoutes;

package/dist/index.d.ts

@@ -5,6 +5,7 @@ declare class App {
     private logger;
     private appVersion;
     app: Express;
+    clientId: string;
     constructor(logger: Logger, appVersion: string);
     private initializeMiddlewares;
     private initializeRoutes;

package/dist/index.js

@@ -1,10 +1,5 @@
-"use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -19,27 +14,6 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -62,15 +36,10 @@ var __async = (__this, __arguments, generator) => {
 };
 
 // src/index.ts
-var index_exports = {};
-__export(index_exports, {
-  App: () => App
-});
-module.exports = __toCommonJS(index_exports);
-var import_express3 = __toESM(require("express"));
+import express3 from "express";
 
 // src/health/router.ts
-var import_express = __toESM(require("express"));
+import express from "express";
 
 // src/health/controller.ts
 var HealthController = class {
@@ -87,7 +56,7 @@ var HealthController = class {
 // src/health/router.ts
 var HealthRouter = class {
   static getRouter(logger, appVersion) {
-    const router = import_express.default.Router();
+    const router = express.Router();
     const controller = new HealthController(logger, appVersion);
     router.get("/health", controller.check);
     return router;
@@ -95,14 +64,21 @@ var HealthRouter = class {
 };
 
 // src/chmed16/router.ts
-var import_express2 = __toESM(require("express"));
+import express2 from "express";
 
 // src/chmed16/controller.ts
-var import_chmed_parser = require("@vereign/chmed-parser");
-var import_pdf_generator = require("@vereign/pdf-generator");
+import {
+  CHMEDParser,
+  SDS,
+  ConformanceError,
+  UpgradeError,
+  DoctorNotFoundError,
+  UnauthorizedError
+} from "@vereign/chmed-parser";
+import { PDFLib } from "@vereign/pdf-generator";
 
 // src/app-error.ts
-var z = __toESM(require("zod/v4"));
+import * as z from "zod/v4";
 var AppError = class extends Error {
   constructor(status, message, code, details) {
     super(message);
@@ -133,7 +109,7 @@ var appErrorSchema = z.object({
 
 // src/chmed16/controller.ts
 var CHMED16AController = class {
-  constructor(logger) {
+  constructor(logger, appVersion, clientId) {
     this.process = (req, res, next) => __async(this, null, function* () {
       const { chmed, lang } = req.body;
       const token = req.token;
@@ -148,8 +124,13 @@ var CHMED16AController = class {
       }
     });
     this.logger = logger;
-    this.sds = new import_chmed_parser.SDS("https://sds-test.hin.ch", logger);
-    this.parser = new import_chmed_parser.CHMEDParser(logger);
+    this.sds = new SDS(
+      "https://oauth2.sds.hin.ch",
+      logger,
+      appVersion,
+      clientId
+    );
+    this.parser = new CHMEDParser(logger);
   }
   parseChmedData(chmed, token, lang) {
     return __async(this, null, function* () {
@@ -161,7 +142,7 @@ var CHMED16AController = class {
         return json;
       } catch (error) {
         this.logger.error("Parsing failed:", error);
-        if (error instanceof import_chmed_parser.ConformanceError) {
+        if (error instanceof ConformanceError) {
           throw new AppError(
             400,
             "CHMED data does not conform to required standards.",
@@ -169,6 +150,32 @@ var CHMED16AController = class {
             error.validationErrors
           );
         }
+        if (error instanceof UpgradeError) {
+          throw new AppError(426, "Upgrade required.", "UPGRADE_ERROR");
+        }
+        if (error instanceof DoctorNotFoundError) {
+          throw new AppError(400, "Failed to fetch doctor by gln", "NOT_FOUND", [
+            {
+              path: "chmed",
+              message: error.message,
+              code: "doctor_not_found"
+            }
+          ]);
+        }
+        if (error instanceof UnauthorizedError) {
+          throw new AppError(
+            401,
+            "Unauthorized access. Check the bearer token.",
+            "UNAUTHORIZED_ERROR",
+            [
+              {
+                path: "chmed",
+                message: error.message,
+                code: "unauthorized_access"
+              }
+            ]
+          );
+        }
         throw new AppError(
           400,
           "Failed to parse CHMED data. Please check the input format.",
@@ -188,7 +195,7 @@ var CHMED16AController = class {
     return __async(this, null, function* () {
       const pdfStart = Date.now();
       try {
-        const pdf = new import_pdf_generator.PDFLib(this.logger);
+        const pdf = new PDFLib(this.logger);
         const pdfBuffer = yield pdf.generateBuffer(json);
         res.setHeader("Content-Type", "application/pdf");
         res.setHeader("Content-Disposition", 'inline; filename="chmed16a.pdf"');
@@ -214,10 +221,10 @@ var CHMED16AController = class {
 };
 
 // src/chmed16/middleware.ts
-var import_zod = require("zod");
+import { ZodError } from "zod";
 
 // src/chmed16/request.ts
-var z2 = __toESM(require("zod/v4"));
+import * as z2 from "zod/v4";
 var chmedPattern = /^CHMED[0-9A-Za-z]+/;
 var bodySchema = z2.object({
   chmed: z2.string().min(5, "string is required").refine(
@@ -248,7 +255,7 @@ var validateBody = (logger) => {
       next();
     } catch (e) {
       logger.debug("Body validation failed", { error: e });
-      if (e instanceof import_zod.ZodError) {
+      if (e instanceof ZodError) {
         const details = e.issues.map((err) => ({
           path: err.path.join("."),
           message: err.message,
@@ -309,9 +316,9 @@ var validateBearerToken = (logger) => {
 
 // src/chmed16/router.ts
 var CHMED16ARouter = class {
-  static getRouter(logger) {
-    const router = import_express2.default.Router();
-    const controller = new CHMED16AController(logger);
+  static getRouter(logger, appVersion, clientId) {
+    const router = express2.Router();
+    const controller = new CHMED16AController(logger, appVersion, clientId);
     router.post(
       "/chmed",
       validateBearerToken(logger),
@@ -323,18 +330,19 @@ var CHMED16ARouter = class {
 };
 
 // src/index.ts
-var import_zod2 = require("zod");
+import { ZodError as ZodError2 } from "zod";
 var App = class {
   constructor(logger, appVersion) {
     this.logger = logger;
     this.appVersion = appVersion;
-    this.app = (0, import_express3.default)();
+    this.clientId = crypto.randomUUID();
+    this.app = express3();
     this.initializeMiddlewares();
     this.initializeRoutes();
     this.initializeErrorHandling();
   }
   initializeMiddlewares() {
-    this.app.use(import_express3.default.json());
+    this.app.use(express3.json());
     this.app.use((req, res, next) => {
       this.logger.info(`${req.method} ${req.url}`);
       next();
@@ -342,7 +350,10 @@ var App = class {
   }
   initializeRoutes() {
     this.app.use("/", HealthRouter.getRouter(this.logger, this.appVersion));
-    this.app.use("/v1", CHMED16ARouter.getRouter(this.logger));
+    this.app.use(
+      "/v1",
+      CHMED16ARouter.getRouter(this.logger, this.appVersion, this.clientId)
+    );
   }
   /**
    * General error handler for all errors, so we can throw from anywhere in the project
@@ -353,7 +364,7 @@ var App = class {
       (e, req, res, next) => {
         this.logger.debug("General Error Handler");
         this.logger.debug(e);
-        if (e instanceof import_zod2.ZodError) {
+        if (e instanceof ZodError2) {
           const details = e.issues.map((err) => ({
             path: err.path.join("."),
             message: err.message,
@@ -397,7 +408,6 @@ var App = class {
     });
   }
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
+export {
   App
-});
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vereign/core",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "description": "core api library for e prescription project",
   "repository": {
     "type": "git",
@@ -9,6 +9,7 @@
   "license": "AGPL-3.0-only",
   "author": "Vereign Team",
   "main": "dist/index.js",
+  "type": "module",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
   "publishConfig": {
@@ -26,8 +27,8 @@
     "test": "vitest run --coverage",
     "test:watch": "vitest --coverage",
     "semantic-release": "semantic-release",
-    "dev": "ts-node-dev ./src/dev-server.ts",
-    "generate:swagger": "npx ts-node ./src/generate-swagger.ts"
+    "dev": "tsx watch ./src/dev-server.ts",
+    "generate:swagger": "tsx ./src/generate-swagger.ts"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.8.1",
@@ -52,16 +53,16 @@
     "prettier": "^3.6.2",
     "semantic-release": "^24.2.7",
     "supertest": "^7.1.4",
-    "ts-node-dev": "^2.0.0",
     "tsup": "^8.5.0",
+    "tsx": "^4.20.6",
     "typescript": "^5.8.3",
     "typescript-eslint": "^8.37.0",
     "vitest": "^3.2.4",
     "zod-openapi": "^5.3.1"
   },
   "dependencies": {
-    "@vereign/chmed-parser": "^1.8.2",
-    "@vereign/pdf-generator": "^1.5.5",
+    "@vereign/chmed-parser": "^1.10.3",
+    "@vereign/pdf-generator": "^1.6.5",
     "express": "^5.1.0",
     "pdfkit": "^0.17.1",
     "winston": "^3.17.0",