The minimalistic document archiving platform.
feat(storage): no longer return storageKey on save (#919)
Corentin Thomassetf29ebc5de71f
diff --git a/apps/papra-server/src/modules/documents/documents.usecases.test.ts b/apps/papra-server/src/modules/documents/documents.usecases.test.tsindex fe1a9d2e..eb5746e1 100644--- a/apps/papra-server/src/modules/documents/documents.usecases.test.ts+++ b/apps/papra-server/src/modules/documents/documents.usecases.test.ts@@ -19,7 +19,7 @@ import { createDocumentsRepository } from './documents.repository';import { documentsTable } from './documents.table';import { createDocumentCreationUsecase, extractAndSaveDocumentFileContent, restoreDocument, trashDocument, updateDocument } from './documents.usecases';import { createDocumentStorageService } from './storage/documents.storage.services';-import { inMemoryStorageDriverFactory } from './storage/drivers/memory/memory.storage-driver';+import { createInMemoryDocumentStorageServices } from './storage/documents.storage.services.test-utils';describe('documents usecases', () => {describe('createDocument', () => {@@ -209,7 +209,7 @@ describe('documents usecases', () => {db,config,taskServices,- documentsStorageService: inMemoryStorageDriverFactory(),+ documentsStorageService: createInMemoryDocumentStorageServices(),eventServices: createTestEventServices(),});@@ -258,7 +258,7 @@ describe('documents usecases', () => {documentsStorage: { driver: 'in-memory' },});const documentsRepository = createDocumentsRepository({ db });- const inMemoryDocumentsStorageService = inMemoryStorageDriverFactory();+ const inMemoryDocumentsStorageService = createInMemoryDocumentStorageServices();const createDocument = createDocumentCreationUsecase({db,@@ -383,7 +383,7 @@ describe('documents usecases', () => {organizationMembers: [{ organizationId: 'organization-1', userId: 'user-1', role: ORGANIZATION_ROLES.OWNER }],});- const inMemoryDocumentsStorageService = inMemoryStorageDriverFactory();+ const inMemoryDocumentsStorageService = createInMemoryDocumentStorageServices();const plansRepository = {getOrganizationPlanById: async _args => ({@@ -436,7 +436,7 @@ describe('documents usecases', () => {const { promise, resolve } = Promise.withResolvers();- const inMemoryDocumentsStorageService = inMemoryStorageDriverFactory();+ const inMemoryDocumentsStorageService = createInMemoryDocumentStorageServices();const documentsStorageService = {...inMemoryDocumentsStorageService,saveFile: async (args) => {@@ -507,7 +507,7 @@ describe('documents usecases', () => {organizationMembers: [{ organizationId: 'organization-1', userId: 'user-1', role: ORGANIZATION_ROLES.OWNER }],});- const inMemoryDocumentsStorageService = inMemoryStorageDriverFactory();+ const inMemoryDocumentsStorageService = createInMemoryDocumentStorageServices();const plansRepository = {getOrganizationPlanById: async _args => ({@@ -565,7 +565,7 @@ describe('documents usecases', () => {db,config,generateDocumentId: () => `doc_${documentIdIndex++}`,- documentsStorageService: inMemoryStorageDriverFactory(),+ documentsStorageService: createInMemoryDocumentStorageServices(),taskServices,eventServices,});diff --git a/apps/papra-server/src/modules/documents/documents.usecases.ts b/apps/papra-server/src/modules/documents/documents.usecases.tsindex 997cc230..fcb8960b 100644--- a/apps/papra-server/src/modules/documents/documents.usecases.ts+++ b/apps/papra-server/src/modules/documents/documents.usecases.ts@@ -112,7 +112,7 @@ export async function createDocument({);// We optimistically save the file to leverage streaming, if the file already exists, we will delete it- const [newFileStorageContext] = await Promise.all([+ const [encryptionMetadata] = await Promise.all([documentsStorageService.saveFile({fileStream: outputStream,storageKey: originalDocumentStorageKey,@@ -134,7 +134,7 @@ export async function createDocument({fileName,organizationId,documentsRepository,- newDocumentStorageKey: newFileStorageContext.storageKey,+ newDocumentStorageKey: originalDocumentStorageKey,tagsRepository,taggingRulesRepository,webhookRepository,@@ -143,7 +143,7 @@ export async function createDocument({logger,}): await createNewDocument({- newFileStorageContext,+ newFileStorageContext: { storageKey: originalDocumentStorageKey, ...encryptionMetadata },fileName,size,mimeType,diff --git a/apps/papra-server/src/modules/documents/e2e/upload-documents.e2e.test.ts b/apps/papra-server/src/modules/documents/e2e/upload-documents.e2e.test.tsindex 57c8e975..9f0eda9c 100644--- a/apps/papra-server/src/modules/documents/e2e/upload-documents.e2e.test.ts+++ b/apps/papra-server/src/modules/documents/e2e/upload-documents.e2e.test.ts@@ -7,7 +7,7 @@ import { overrideConfig } from '../../config/config.test-utils';import { ORGANIZATION_ROLES } from '../../organizations/organizations.constants';import { PLUS_PLAN_ID, PRO_PLAN_ID } from '../../plans/plans.constants';import { documentsTable } from '../documents.table';-import { inMemoryStorageDriverFactory } from '../storage/drivers/memory/memory.storage-driver';+import { createInMemoryDocumentStorageServices } from '../storage/documents.storage.services.test-utils';describe('documents e2e', () => {describe('document upload', () => {@@ -85,7 +85,7 @@ describe('documents e2e', () => {organizationMembers: [{ organizationId: 'org_222222222222222222222222', userId: 'usr_111111111111111111111111', role: ORGANIZATION_ROLES.OWNER }],});- const documentsStorageService = inMemoryStorageDriverFactory();+ const documentsStorageService = createInMemoryDocumentStorageServices();const { app } = createServer(createTestServerDependencies({db,diff --git a/apps/papra-server/src/modules/documents/events/activity-log.document-created.test.ts b/apps/papra-server/src/modules/documents/events/activity-log.document-created.test.tsindex 8d6f9b59..926a546c 100644--- a/apps/papra-server/src/modules/documents/events/activity-log.document-created.test.ts+++ b/apps/papra-server/src/modules/documents/events/activity-log.document-created.test.ts@@ -10,7 +10,7 @@ import { createReadableStream } from '../../shared/streams/readable-stream';import { createInMemoryTaskServices } from '../../tasks/tasks.test-utils';import { documentActivityLogTable } from '../document-activity/document-activity.table';import { createDocumentCreationUsecase } from '../documents.usecases';-import { inMemoryStorageDriverFactory } from '../storage/drivers/memory/memory.storage-driver';+import { createInMemoryDocumentStorageServices } from '../storage/documents.storage.services.test-utils';import { registerInsertActivityLogOnDocumentCreatedHandler } from './activity-log.document-created';describe('activity-log document-created', () => {@@ -34,7 +34,7 @@ describe('activity-log document-created', () => {db,config,generateDocumentId: createDeterministicIdGenerator({ prefix: 'doc' }),- documentsStorageService: inMemoryStorageDriverFactory(),+ documentsStorageService: createInMemoryDocumentStorageServices(),taskServices,eventServices,});diff --git a/apps/papra-server/src/modules/documents/storage/documents.storage.services.test-utils.ts b/apps/papra-server/src/modules/documents/storage/documents.storage.services.test-utils.tsnew file mode 100644index 00000000..3fc21cc7--- /dev/null+++ b/apps/papra-server/src/modules/documents/storage/documents.storage.services.test-utils.ts@@ -0,0 +1,19 @@+import { createDocumentStorageServiceFromDriver } from './documents.storage.services';+import { inMemoryStorageDriverFactory } from './drivers/memory/memory.storage-driver';++export function createInMemoryDocumentStorageServices() {+ const driver = inMemoryStorageDriverFactory();++ const service = createDocumentStorageServiceFromDriver({+ storageDriver: driver,+ encryptionConfig: {+ isEncryptionEnabled: false,+ documentKeyEncryptionKeys: [],+ },+ });++ return {+ ...service,+ _getStorage: driver._getStorage,+ };+}diff --git a/apps/papra-server/src/modules/documents/storage/drivers/az-blob/az-blob.storage-driver.ts b/apps/papra-server/src/modules/documents/storage/drivers/az-blob/az-blob.storage-driver.tsindex 5f72a8fc..0fa6a548 100644--- a/apps/papra-server/src/modules/documents/storage/drivers/az-blob/az-blob.storage-driver.ts+++ b/apps/papra-server/src/modules/documents/storage/drivers/az-blob/az-blob.storage-driver.ts@@ -28,8 +28,6 @@ export const azBlobStorageDriverFactory = defineStorageDriver(({ documentStorage? createFileAlreadyExistsInStorageError(): error;}-- return { storageKey };},getFileStream: async ({ storageKey }) => {const [response, error] = await safely(getBlockBlobClient({ storageKey }).download());diff --git a/apps/papra-server/src/modules/documents/storage/drivers/drivers.models.ts b/apps/papra-server/src/modules/documents/storage/drivers/drivers.models.tsindex baaf4e71..c02a6219 100644--- a/apps/papra-server/src/modules/documents/storage/drivers/drivers.models.ts+++ b/apps/papra-server/src/modules/documents/storage/drivers/drivers.models.ts@@ -9,7 +9,7 @@ export type StorageDriver = {fileName: string;mimeType: string;storageKey: string;- }) => Promise<{ storageKey: string }>;+ }) => Promise<void>;getFileStream: (args: { storageKey: string }) => Promise<{fileStream: Readable;diff --git a/apps/papra-server/src/modules/documents/storage/drivers/drivers.test-suite.ts b/apps/papra-server/src/modules/documents/storage/drivers/drivers.test-suite.tsindex f7b558ad..b99f4aec 100644--- a/apps/papra-server/src/modules/documents/storage/drivers/drivers.test-suite.ts+++ b/apps/papra-server/src/modules/documents/storage/drivers/drivers.test-suite.ts@@ -13,7 +13,13 @@ export function runDriverTestSuites({ createDriver: createDriverBase, timeout, rconst { driver, [Symbol.asyncDispose]: dispose } = await createDriverBase();return {- storageServices: driver as StorageServices,+ storageServices: {+ ...driver,+ saveFile: async (args) => {+ await driver.saveFile(args);+ return {};+ },+ } as StorageServices,[Symbol.asyncDispose]: dispose,};},@@ -24,7 +30,15 @@ export function runDriverTestSuites({ createDriver: createDriverBase, timeout, rconst { driver, [Symbol.asyncDispose]: dispose } = await createDriverBase();return {- storageServices: wrapWithEncryptionLayer({ storageDriver: driver, encryptionConfig: { isEncryptionEnabled: true, documentKeyEncryptionKeys: [{ version: '1', key: Buffer.from('622b55bec85b3fca6fbad2d1c5ef1d67ed19b24eece069961cd430370735c2ff', 'hex') }] } }),+ storageServices: wrapWithEncryptionLayer({+ storageDriver: driver,+ encryptionConfig: {+ isEncryptionEnabled: true,+ documentKeyEncryptionKeys: [+ { version: '1', key: Buffer.from('622b55bec85b3fca6fbad2d1c5ef1d67ed19b24eece069961cd430370735c2ff', 'hex') },+ ],+ },+ }),[Symbol.asyncDispose]: dispose,};},diff --git a/apps/papra-server/src/modules/documents/storage/drivers/fs/fs.storage-driver.int.test.ts b/apps/papra-server/src/modules/documents/storage/drivers/fs/fs.storage-driver.int.test.tsindex d533e43a..fc331dab 100644--- a/apps/papra-server/src/modules/documents/storage/drivers/fs/fs.storage-driver.int.test.ts+++ b/apps/papra-server/src/modules/documents/storage/drivers/fs/fs.storage-driver.int.test.ts@@ -41,15 +41,15 @@ describe('storage driver', () => {describe('saveFile', () => {test('persists the file to the filesystem', async () => {const fsStorageDriver = fsStorageDriverFactory({ documentStorageConfig: { drivers: { filesystem: { root: tmpDirectory } } } as DocumentStorageConfig });+ const storageKey = 'org_1/text-file.txt';- const { storageKey } = await fsStorageDriver.saveFile({+ await fsStorageDriver.saveFile({fileStream: createReadableStream({ content: 'lorem ipsum' }),fileName: 'text-file.txt',mimeType: 'text/plain',- storageKey: 'org_1/text-file.txt',+ storageKey,});- expect(storageKey).to.eql(`org_1/text-file.txt`);const storagePath = path.join(tmpDirectory, storageKey);const fileExists = await fs.promises.access(storagePath, fs.constants.F_OK).then(() => true).catch(() => false);diff --git a/apps/papra-server/src/modules/documents/storage/drivers/fs/fs.storage-driver.ts b/apps/papra-server/src/modules/documents/storage/drivers/fs/fs.storage-driver.tsindex 2fa811f0..7761a89c 100644--- a/apps/papra-server/src/modules/documents/storage/drivers/fs/fs.storage-driver.ts+++ b/apps/papra-server/src/modules/documents/storage/drivers/fs/fs.storage-driver.ts@@ -27,7 +27,7 @@ export const fsStorageDriverFactory = defineStorageDriver(({ documentStorageConfreturn new Promise((resolve, reject) => {writeStream.on('finish', () => {- resolve({ storageKey });+ resolve();});writeStream.on('error', (error) => {diff --git a/apps/papra-server/src/modules/documents/storage/drivers/memory/memory.storage-driver.int.test.ts b/apps/papra-server/src/modules/documents/storage/drivers/memory/memory.storage-driver.int.test.tsindex d788a8f3..cf003dab 100644--- a/apps/papra-server/src/modules/documents/storage/drivers/memory/memory.storage-driver.int.test.ts+++ b/apps/papra-server/src/modules/documents/storage/drivers/memory/memory.storage-driver.int.test.ts@@ -23,15 +23,13 @@ describe('memory storage-driver', () => {const file = new File(['lorem ipsum'], 'text-file.txt', { type: 'text/plain' });- const { storageKey } = await inMemoryStorageDriver.saveFile({+ await inMemoryStorageDriver.saveFile({fileStream: fileToReadableStream(file),fileName: 'text-file.txt',mimeType: 'text/plain',storageKey: 'org_1/text-file.txt',});- expect(storageKey).to.eql('org_1/text-file.txt');-const { fileStream } = await inMemoryStorageDriver.getFileStream({storageKey: 'org_1/text-file.txt',});diff --git a/apps/papra-server/src/modules/documents/storage/drivers/memory/memory.storage-driver.ts b/apps/papra-server/src/modules/documents/storage/drivers/memory/memory.storage-driver.tsindex b71b2462..c4f9d661 100644--- a/apps/papra-server/src/modules/documents/storage/drivers/memory/memory.storage-driver.ts+++ b/apps/papra-server/src/modules/documents/storage/drivers/memory/memory.storage-driver.ts@@ -21,8 +21,6 @@ export const inMemoryStorageDriverFactory = defineStorageDriver(() => {const content = await collectReadableStreamToBuffer({ stream: fileStream });storage.set(storageKey, { content, mimeType, fileName });-- return { storageKey };},getFileStream: async ({ storageKey }) => {diff --git a/apps/papra-server/src/modules/documents/storage/drivers/s3/s3.storage-driver.ts b/apps/papra-server/src/modules/documents/storage/drivers/s3/s3.storage-driver.tsindex d27b76c4..8bd7970b 100644--- a/apps/papra-server/src/modules/documents/storage/drivers/s3/s3.storage-driver.ts+++ b/apps/papra-server/src/modules/documents/storage/drivers/s3/s3.storage-driver.ts@@ -66,8 +66,6 @@ export const s3StorageDriverFactory = defineStorageDriver(({ documentStorageConf});await upload.done();-- return { storageKey };},getFileStream: async ({ storageKey }) => {const [result, error] = await safely(s3Client.send(new GetObjectCommand({diff --git a/apps/papra-server/src/modules/documents/storage/encryption/document-encryption.services.ts b/apps/papra-server/src/modules/documents/storage/encryption/document-encryption.services.tsindex 9a643fb2..897ccbb8 100644--- a/apps/papra-server/src/modules/documents/storage/encryption/document-encryption.services.ts+++ b/apps/papra-server/src/modules/documents/storage/encryption/document-encryption.services.ts@@ -15,7 +15,8 @@ export function wrapWithEncryptionLayer({ storageDriver, encryptionConfig }: { sconst { fileStream, ...rest } = driverArgs;if (!isEncryptionEnabled) {- return storageDriver.saveFile(driverArgs);+ await storageDriver.saveFile(driverArgs);+ return {}; // No encryption metadata to return}// Create a random 32 bytes encryption key@@ -23,7 +24,7 @@ export function wrapWithEncryptionLayer({ storageDriver, encryptionConfig }: { sconst encryptedFileStream = createEncryptTransformer({ key: encryptionKey });- const driverResult = await storageDriver.saveFile({+ await storageDriver.saveFile({fileStream: fileStream.pipe(encryptedFileStream),...rest,});@@ -32,7 +33,6 @@ export function wrapWithEncryptionLayer({ storageDriver, encryptionConfig }: { sconst kek = getMostRecentDocumentKek({ documentKeyEncryptionKeys });return {- ...driverResult,fileEncryptionKeyWrapped: wrapEncryptionKey({ encryptionKey, kek }),fileEncryptionAlgorithm: ENCRYPTION_ALGORITHMS.AES_256_GCM,fileEncryptionKekVersion: kek.version,diff --git a/apps/papra-server/src/modules/documents/storage/encryption/document-encryption.usecases.ts b/apps/papra-server/src/modules/documents/storage/encryption/document-encryption.usecases.tsindex a5387ae4..011394ed 100644--- a/apps/papra-server/src/modules/documents/storage/encryption/document-encryption.usecases.ts+++ b/apps/papra-server/src/modules/documents/storage/encryption/document-encryption.usecases.ts@@ -39,19 +39,18 @@ export async function encryptAllUnencryptedDocuments({fileEncryptionKekVersion: null,});const newStorageKey = `${originalStorageKey}.enc`;- const { storageKey, ...encryptionFields }- = await documentStorageService.saveFile({- fileStream,- fileName,- mimeType,- storageKey: newStorageKey,- });+ const encryptionFields = await documentStorageService.saveFile({+ fileStream,+ fileName,+ mimeType,+ storageKey: newStorageKey,+ });await db.update(documentsTable).set({...encryptionFields,- originalStorageKey: storageKey,+ originalStorageKey: newStorageKey,}).where(eq(documentsTable.id, id));diff --git a/apps/papra-server/src/modules/ingestion-folders/ingestion-folders.usecases.test.ts b/apps/papra-server/src/modules/ingestion-folders/ingestion-folders.usecases.test.tsindex fb3b14ae..5ff905ee 100644--- a/apps/papra-server/src/modules/ingestion-folders/ingestion-folders.usecases.test.ts+++ b/apps/papra-server/src/modules/ingestion-folders/ingestion-folders.usecases.test.ts@@ -5,7 +5,7 @@ import { createTestEventServices } from '../app/events/events.test-utils';import { overrideConfig } from '../config/config.test-utils';import { documentsTable } from '../documents/documents.table';import { createDocumentCreationUsecase } from '../documents/documents.usecases';-import { inMemoryStorageDriverFactory } from '../documents/storage/drivers/memory/memory.storage-driver';+import { createInMemoryDocumentStorageServices } from '../documents/storage/documents.storage.services.test-utils';import { createOrganizationsRepository } from '../organizations/organizations.repository';import { createInMemoryFsServices } from '../shared/fs/fs.in-memory';import { createTestLogger } from '../shared/logger/logger.test-utils';@@ -38,7 +38,7 @@ describe('ingestion-folders usecases', () => {},});- const documentsStorageService = inMemoryStorageDriverFactory();+ const documentsStorageService = createInMemoryDocumentStorageServices();let documentIdIndex = 1;const generateDocumentId = () => `doc_${documentIdIndex++}`;@@ -141,7 +141,7 @@ describe('ingestion-folders usecases', () => {},});- const documentsStorageService = inMemoryStorageDriverFactory();+ const documentsStorageService = createInMemoryDocumentStorageServices();let documentIdIndex = 1;const generateDocumentId = () => `doc_${documentIdIndex++}`;@@ -245,7 +245,7 @@ describe('ingestion-folders usecases', () => {},});- const documentsStorageService = inMemoryStorageDriverFactory();+ const documentsStorageService = createInMemoryDocumentStorageServices();let documentIdIndex = 1;const generateDocumentId = () => `doc_${documentIdIndex++}`;@@ -318,7 +318,7 @@ describe('ingestion-folders usecases', () => {},});- const documentsStorageService = inMemoryStorageDriverFactory();+ const documentsStorageService = createInMemoryDocumentStorageServices();let documentIdIndex = 1;const generateDocumentId = () => `doc_${documentIdIndex++}`;@@ -450,7 +450,7 @@ describe('ingestion-folders usecases', () => {});const organizationsRepository = createOrganizationsRepository({ db });- const documentsStorageService = inMemoryStorageDriverFactory();+ const documentsStorageService = createInMemoryDocumentStorageServices();let documentIdIndex = 1;const generateDocumentId = () => `doc_${documentIdIndex++}`;diff --git a/apps/papra-server/src/modules/intake-emails/intake-emails.usecases.test.ts b/apps/papra-server/src/modules/intake-emails/intake-emails.usecases.test.tsindex 7afbba8b..5e65816e 100644--- a/apps/papra-server/src/modules/intake-emails/intake-emails.usecases.test.ts+++ b/apps/papra-server/src/modules/intake-emails/intake-emails.usecases.test.ts@@ -8,7 +8,7 @@ import { createTestEventServices } from '../app/events/events.test-utils';import { overrideConfig } from '../config/config.test-utils';import { documentsTable } from '../documents/documents.table';import { createDocumentCreationUsecase } from '../documents/documents.usecases';-import { inMemoryStorageDriverFactory } from '../documents/storage/drivers/memory/memory.storage-driver';+import { createInMemoryDocumentStorageServices } from '../documents/storage/documents.storage.services.test-utils';import { PLUS_PLAN_ID } from '../plans/plans.constants';import { createSubscriptionsRepository } from '../subscriptions/subscriptions.repository';import { createInMemoryTaskServices } from '../tasks/tasks.test-utils';@@ -32,7 +32,7 @@ describe('intake-emails usecases', () => {const createDocument = createDocumentCreationUsecase({db,taskServices,- documentsStorageService: inMemoryStorageDriverFactory(),+ documentsStorageService: createInMemoryDocumentStorageServices(),config: overrideConfig({organizationPlans: { isFreePlanUnlimited: true },}),@@ -75,7 +75,7 @@ describe('intake-emails usecases', () => {const createDocument = createDocumentCreationUsecase({db,taskServices,- documentsStorageService: inMemoryStorageDriverFactory(),+ documentsStorageService: createInMemoryDocumentStorageServices(),config: overrideConfig({organizationPlans: { isFreePlanUnlimited: true },}),@@ -109,7 +109,7 @@ describe('intake-emails usecases', () => {const createDocument = createDocumentCreationUsecase({db,taskServices,- documentsStorageService: inMemoryStorageDriverFactory(),+ documentsStorageService: createInMemoryDocumentStorageServices(),config: overrideConfig({organizationPlans: { isFreePlanUnlimited: true },}),@@ -148,7 +148,7 @@ describe('intake-emails usecases', () => {const createDocument = createDocumentCreationUsecase({db,taskServices,- documentsStorageService: inMemoryStorageDriverFactory(),+ documentsStorageService: createInMemoryDocumentStorageServices(),config: overrideConfig({organizationPlans: { isFreePlanUnlimited: true },}),@@ -198,7 +198,7 @@ describe('intake-emails usecases', () => {const createDocument = createDocumentCreationUsecase({db,taskServices,- documentsStorageService: inMemoryStorageDriverFactory(),+ documentsStorageService: createInMemoryDocumentStorageServices(),config: overrideConfig({organizationPlans: { isFreePlanUnlimited: true },}),diff --git a/apps/papra-server/src/modules/shared/types.ts b/apps/papra-server/src/modules/shared/types.tsindex b96f2b28..6071ee47 100644--- a/apps/papra-server/src/modules/shared/types.ts+++ b/apps/papra-server/src/modules/shared/types.ts@@ -2,6 +2,8 @@ export type NonEmptyArray<T> = [T, ...T[]];export type ExtendNamedArguments<Method, NewArgs extends Record<string, unknown>> = Method extends (args: infer Args) => infer Return ? (args: Args & NewArgs) => Return : never;export type ExtendReturn<Method, NewReturn extends Record<string, unknown>> = Method extends (args: infer Args) => infer Return ? (args: Args) => Return & NewReturn : never;-export type ExtendReturnPromise<Method, NewReturn extends Record<string, unknown>> = Method extends (args: infer Args) => Promise<infer Return> ? (args: Args) => Promise<Return & NewReturn> : never;+export type ExtendReturnPromise<Method, NewReturn extends Record<string, unknown>> = Method extends (args: infer Args) => Promise<infer Return> ? (args: Args) => Promise<[Return] extends [void] ? NewReturn : Return & NewReturn> : never;export type ArrayElement<ArrayType extends readonly unknown[]> = ArrayType extends readonly (infer ElementType)[] ? ElementType : never;++export type EmptyRecord = Record<string, never>;