@diia-inhouse/db 12.3.23 → 12.4.1

package/dist/index.d.ts

@@ -11,7 +11,7 @@ import { EncryptedStorage } from "./interfaces/models/encryptedStorage.js";
 import { models, mongoose } from "./interfaces/index.js";
 import { DatabaseService } from "./services/database.js";
 import { PostgresDatabaseService } from "./services/postgresDatabase.js";
-import { EncryptedStorageService } from "./services/encryptedStorage.js";
+import { EncryptedStorageService, JweEncrypter, buildEncryptedStorageEntry } from "./services/encryptedStorage.js";
 import { CounterService } from "./services/counter.js";
 import { MongoHelper } from "./mongo.js";
 import { counterSchema } from "./schemas/counter.js";
@@ -22,7 +22,7 @@ export * from "mongoose";
 
 //#region src/index.d.ts
 declare namespace index_d_exports {
-  export { AppDb, AppDbConfig, Counter, CounterService, DatabaseAdapter, DatabaseAdapterType, DatabaseService, DbConnectionStatus, DbOpLog, DbOpLogEntry, DbStatusByType, DbType, DerivedRepository, EncryptedStorage, EncryptedStorageService, MigrateMongoConfig, MongoDBErrorCode, MongoDbStatus, MongoHelper, MongodbOperationResult, MongodbOperationsLabelsMap, PostgresDatabase, PostgresDatabaseService, PostgresDbConfig, PostgresErrorCode, ReplicaSetNodeConfig, counter, counterSchema, createStatusHistoryItemSchema, encryptedStorage, encryptedStorageSchema, expiringTimestamp, models, mongodbOperationsAllowedFields, mongodbOperationsDefaultBuckets, mongoose, timestamps };
+  export { AppDb, AppDbConfig, Counter, CounterService, DatabaseAdapter, DatabaseAdapterType, DatabaseService, DbConnectionStatus, DbOpLog, DbOpLogEntry, DbStatusByType, DbType, DerivedRepository, EncryptedStorage, EncryptedStorageService, JweEncrypter, MigrateMongoConfig, MongoDBErrorCode, MongoDbStatus, MongoHelper, MongodbOperationResult, MongodbOperationsLabelsMap, PostgresDatabase, PostgresDatabaseService, PostgresDbConfig, PostgresErrorCode, ReplicaSetNodeConfig, buildEncryptedStorageEntry, counter, counterSchema, createStatusHistoryItemSchema, encryptedStorage, encryptedStorageSchema, expiringTimestamp, models, mongodbOperationsAllowedFields, mongodbOperationsDefaultBuckets, mongoose, timestamps };
 }
 //#endregion
-export { AppDb, AppDbConfig, Counter, CounterService, DatabaseAdapter, DatabaseAdapterType, DatabaseService, DbConnectionStatus, DbOpLog, DbOpLogEntry, DbStatusByType, DbType, DerivedRepository, EncryptedStorage, EncryptedStorageService, MigrateMongoConfig, MongoDBErrorCode, MongoDbStatus, MongoHelper, MongodbOperationResult, MongodbOperationsLabelsMap, PostgresDatabase, PostgresDatabaseService, PostgresDbConfig, PostgresErrorCode, ReplicaSetNodeConfig, counter, counterSchema, createStatusHistoryItemSchema, encryptedStorage, encryptedStorageSchema, expiringTimestamp, models, mongodbOperationsAllowedFields, mongodbOperationsDefaultBuckets, mongoose, timestamps };
+export { AppDb, AppDbConfig, Counter, CounterService, DatabaseAdapter, DatabaseAdapterType, DatabaseService, DbConnectionStatus, DbOpLog, DbOpLogEntry, DbStatusByType, DbType, DerivedRepository, EncryptedStorage, EncryptedStorageService, JweEncrypter, MigrateMongoConfig, MongoDBErrorCode, MongoDbStatus, MongoHelper, MongodbOperationResult, MongodbOperationsLabelsMap, PostgresDatabase, PostgresDatabaseService, PostgresDbConfig, PostgresErrorCode, ReplicaSetNodeConfig, buildEncryptedStorageEntry, counter, counterSchema, createStatusHistoryItemSchema, encryptedStorage, encryptedStorageSchema, expiringTimestamp, models, mongodbOperationsAllowedFields, mongodbOperationsDefaultBuckets, mongoose, timestamps };

package/dist/index.js

@@ -8,7 +8,7 @@ import { DatabaseService } from "./services/database.js";
 import { PostgresDatabaseService } from "./services/postgresDatabase.js";
 import { expiringTimestamp, timestamps } from "./postgresUtils.js";
 import { encryptedStorage } from "./tables/encryptedStorage.js";
-import { EncryptedStorageService } from "./services/encryptedStorage.js";
+import { EncryptedStorageService, buildEncryptedStorageEntry } from "./services/encryptedStorage.js";
 import { counter } from "./tables/counter.js";
 import { CounterService } from "./services/counter.js";
 import "./services/index.js";
@@ -20,4 +20,4 @@ import "./schemas/index.js";
 import "./postgres.js";
 export * from "mongoose";
 //#endregion
-export { CounterService, DatabaseService, DbConnectionStatus, DbType, EncryptedStorageService, MongoDBErrorCode, MongoHelper, MongodbOperationResult, PostgresDatabaseService, PostgresErrorCode, counter, counterSchema, createStatusHistoryItemSchema, encryptedStorage, encryptedStorageSchema, expiringTimestamp, models, mongodbOperationsAllowedFields, mongodbOperationsDefaultBuckets, mongoose, timestamps };
+export { CounterService, DatabaseService, DbConnectionStatus, DbType, EncryptedStorageService, MongoDBErrorCode, MongoHelper, MongodbOperationResult, PostgresDatabaseService, PostgresErrorCode, buildEncryptedStorageEntry, counter, counterSchema, createStatusHistoryItemSchema, encryptedStorage, encryptedStorageSchema, expiringTimestamp, models, mongodbOperationsAllowedFields, mongodbOperationsDefaultBuckets, mongoose, timestamps };

package/dist/services/encryptedStorage.d.ts

@@ -6,6 +6,8 @@ import { EnvService } from "@diia-inhouse/env";
 import { AuthService } from "@diia-inhouse/crypto";
 
 //#region src/services/encryptedStorage.d.ts
+type JweEncrypter = Pick<AuthService, "encryptJWE">;
+declare function buildEncryptedStorageEntry(auth: JweEncrypter, data: unknown, expiration: number, withSource: boolean): Promise<EncryptedStorage>;
 /**
 * EncryptedStorageService provides CRUD operations for managing encrypted storage entries
 * in both Postgres and MongoDB databases. The service abstracts database implementation details
@@ -70,4 +72,4 @@ declare class EncryptedStorageService {
   private getPostgresDatabase;
 }
 //#endregion
-export { EncryptedStorageService };
+export { EncryptedStorageService, JweEncrypter, buildEncryptedStorageEntry };

package/dist/services/encryptedStorage.js

@@ -3,6 +3,14 @@ import { NotFoundError } from "@diia-inhouse/errors";
 import { eq, inArray } from "drizzle-orm";
 import { utils } from "@diia-inhouse/utils";
 //#region src/services/encryptedStorage.ts
+async function buildEncryptedStorageEntry(auth, data, expiration, withSource) {
+	const storageItem = {
+		data: await auth.encryptJWE(utils.encodeObjectToBase64(data)),
+		expiresAt: new Date(Date.now() + expiration)
+	};
+	if (withSource) storageItem.source = data;
+	return storageItem;
+}
 /**
 * EncryptedStorageService provides CRUD operations for managing encrypted storage entries
 * in both Postgres and MongoDB databases. The service abstracts database implementation details
@@ -104,11 +112,7 @@ var EncryptedStorageService = class {
 		this.postgresDatabase = postgresDatabase;
 	}
 	async save(data, expiration) {
-		const storageItem = {
-			data: await this.auth.encryptJWE(utils.encodeObjectToBase64(data)),
-			expiresAt: new Date(Date.now() + expiration)
-		};
-		if (!this.envService.isProd()) storageItem.source = data;
+		const storageItem = await buildEncryptedStorageEntry(this.auth, data, expiration, !this.envService.isProd());
 		return await this.saveEntityStrategy[this.databaseAdapter](storageItem);
 	}
 	async get(id, options = {}) {
@@ -176,4 +180,4 @@ var EncryptedStorageService = class {
 	}
 };
 //#endregion
-export { EncryptedStorageService };
+export { EncryptedStorageService, buildEncryptedStorageEntry };

package/dist/services/index.d.ts

@@ -1,4 +1,4 @@
 import { DatabaseService } from "./database.js";
 import { PostgresDatabaseService } from "./postgresDatabase.js";
-import { EncryptedStorageService } from "./encryptedStorage.js";
+import { EncryptedStorageService, JweEncrypter, buildEncryptedStorageEntry } from "./encryptedStorage.js";
 import { CounterService } from "./counter.js";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@diia-inhouse/db",
-    "version": "12.3.23",
+    "version": "12.4.1",
     "type": "module",
     "description": "Package with database connection",
     "main": "dist/index.js",
@@ -40,11 +40,11 @@
         "lint:lockfile": "lockfile-lint --path package-lock.json --allowed-hosts registry.npmjs.org --validate-https"
     },
     "dependencies": {
-        "@diia-inhouse/crypto": "2.1.2",
-        "@diia-inhouse/diia-logger": "4.4.33",
-        "@diia-inhouse/diia-metrics": "7.1.69",
-        "@diia-inhouse/utils": "6.0.67",
-        "@diia-inhouse/validators": "2.2.51",
+        "@diia-inhouse/crypto": "2.1.5",
+        "@diia-inhouse/diia-logger": "4.4.41",
+        "@diia-inhouse/diia-metrics": "7.1.77",
+        "@diia-inhouse/utils": "6.0.75",
+        "@diia-inhouse/validators": "2.2.57",
         "@types/migrate-mongo": "10.0.6",
         "bson": "7.2.0",
         "drizzle-orm": "0.45.2",
@@ -63,10 +63,10 @@
     },
     "devDependencies": {
         "@diia-inhouse/configs": "7.0.1",
-        "@diia-inhouse/env": "3.3.42",
-        "@diia-inhouse/errors": "2.2.13",
+        "@diia-inhouse/env": "3.3.44",
+        "@diia-inhouse/errors": "2.2.16",
         "@diia-inhouse/oxc-config": "2.1.1",
-        "@diia-inhouse/test": "8.2.30",
+        "@diia-inhouse/test": "8.3.2",
         "@diia-inhouse/types": "14.2.3",
         "@types/lodash": "4.17.24",
         "@types/node": "25.6.2",