From d7422efcf0009cd65c3d0e124efb7bc54203637b Mon Sep 17 00:00:00 2001 From: chatenium Date: Wed, 8 Apr 2026 16:56:09 +0200 Subject: [PATCH] Quick-fix --- src/core/http.ts | 2 +- src/core/webSocketHandler.ts | 10 +++++----- src/domain/dmService.schema.ts | 2 +- src/domain/networkService.schema.ts | 2 +- src/domain/pictureService.schema.ts | 2 +- src/domain/sessionManager.schema.ts | 4 ++-- src/domain/textChannelService.schema.ts | 2 +- src/domain/userService.schema.ts | 2 +- src/mocks/handlers/auth.http.ts | 4 ++-- src/mocks/handlers/brcChan.http.ts | 4 ++-- src/mocks/handlers/call.http.ts | 2 +- src/mocks/handlers/chat.http.ts | 2 +- src/mocks/handlers/dm.http.ts | 6 +++--- src/mocks/handlers/fUpl.http.ts | 4 ++-- src/mocks/handlers/network.http.ts | 4 ++-- src/mocks/handlers/picture.http.ts | 4 ++-- src/mocks/handlers/user.http.ts | 4 ++-- src/mocks/index.ts | 18 +++++++++--------- src/mocks/node.ts | 2 +- src/mocks/storage/database.ts | 2 +- src/mocks/storage/keyring.ts | 2 +- src/services/authService.test.ts | 4 ++-- src/services/authService.ts | 6 +++--- src/services/broadcastChannelService.test.ts | 2 +- src/services/broadcastChannelService.ts | 12 ++++++------ src/services/callService.test.ts | 2 +- src/services/callService.ts | 8 ++++---- src/services/chatService.test.ts | 4 ++-- src/services/chatService.ts | 16 ++++++++-------- src/services/dmService.test.ts | 4 ++-- src/services/dmService.ts | 18 +++++++++--------- src/services/fileTransferService.ts | 14 +++++++------- src/services/fileUploadService.test.ts | 2 +- src/services/fileUploadService.ts | 8 ++++---- src/services/networkService.test.ts | 8 ++++---- src/services/networkService.ts | 16 ++++++++-------- src/services/pictureService.test.ts | 4 ++-- src/services/pictureService.ts | 14 +++++++------- src/services/sessionManager.ts | 14 +++++++------- src/services/textChannelService.ts | 18 +++++++++--------- src/services/userService.test.ts | 4 ++-- src/services/userService.ts | 18 +++++++++--------- src/vitest.setup.unit.ts | 2 +- tests/authService.test.ts | 4 ++-- tests/broadcastChannelService.test.ts | 2 +- tests/chatsService.test.ts | 4 ++-- tests/dmService.test.ts | 6 +++--- tests/fileUploadService.test.ts | 8 ++++---- tests/networkService.test.ts | 14 +++++++------- tests/pictureService.test.ts | 10 +++++----- tests/textChannelService.test.ts | 8 ++++---- tests/userService.test.ts | 6 +++--- tests/vitest.setup.integration.ts | 4 ++-- tests/webSocketHandler.test.ts | 2 +- tsconfig.json | 2 +- 55 files changed, 176 insertions(+), 176 deletions(-) diff --git a/src/core/http.ts b/src/core/http.ts index 5e4a5ae..0b0f3c8 100644 --- a/src/core/http.ts +++ b/src/core/http.ts @@ -1,5 +1,5 @@ import axios, {AxiosInstance} from 'axios'; -import {environment} from "./environment"; +import {environment} from './environment.js'; export const getClient = (cdn: boolean) => { const env = environment.get(); diff --git a/src/core/webSocketHandler.ts b/src/core/webSocketHandler.ts index 92216cf..c3c6d3e 100644 --- a/src/core/webSocketHandler.ts +++ b/src/core/webSocketHandler.ts @@ -4,12 +4,12 @@ import { WSMakeTokenReq, WSMakeTokenResp, WSMessagePayload -} from "../domain/websocket.schema"; -import {getClient} from "./http"; -import {CreateNetworkReq, Network} from "../domain/networkService.schema"; +} from '../domain/websocket.schema.js'; +import {getClient} from './http.js'; +import {CreateNetworkReq, Network} from '../domain/networkService.schema.js'; import {isAxiosError} from "axios"; -import {GenericErrorBody} from "../domain/http.schema"; -import {environment} from "./environment"; +import {GenericErrorBody} from '../domain/http.schema.js'; +import {environment} from './environment.js'; export class WebSocketHandler { private static instance: WebSocketHandler; diff --git a/src/domain/dmService.schema.ts b/src/domain/dmService.schema.ts index 8b45f2a..dc3281e 100644 --- a/src/domain/dmService.schema.ts +++ b/src/domain/dmService.schema.ts @@ -1,4 +1,4 @@ -import {Attachment, TimeStamp} from "./common.schema"; +import {Attachment, TimeStamp} from './common.schema.js'; export interface GetMessageReq { from: number diff --git a/src/domain/networkService.schema.ts b/src/domain/networkService.schema.ts index 2b0e764..43929eb 100644 --- a/src/domain/networkService.schema.ts +++ b/src/domain/networkService.schema.ts @@ -1,5 +1,5 @@ // Request schemas -import {PublicUserData, RGB, TimeStamp} from "./common.schema"; +import {PublicUserData, RGB, TimeStamp} from './common.schema.js'; export interface GetInvitesReq { networkId: string diff --git a/src/domain/pictureService.schema.ts b/src/domain/pictureService.schema.ts index c8fd651..39a9063 100644 --- a/src/domain/pictureService.schema.ts +++ b/src/domain/pictureService.schema.ts @@ -1,4 +1,4 @@ -import {PublicUserData, TimeStamp} from "./common.schema"; +import {PublicUserData, TimeStamp} from './common.schema.js'; // Request schemas export interface GetReq { diff --git a/src/domain/sessionManager.schema.ts b/src/domain/sessionManager.schema.ts index 8d1481f..6a44aa6 100644 --- a/src/domain/sessionManager.schema.ts +++ b/src/domain/sessionManager.schema.ts @@ -1,5 +1,5 @@ -import {PublicUserData} from "./common.schema"; -import {GIF, PersonalUserData} from "./userService.schema"; +import {PublicUserData} from './common.schema.js'; +import {GIF, PersonalUserData} from './userService.schema.js'; export interface Session { userData: PersonalUserData diff --git a/src/domain/textChannelService.schema.ts b/src/domain/textChannelService.schema.ts index 7cf88a6..50363dd 100644 --- a/src/domain/textChannelService.schema.ts +++ b/src/domain/textChannelService.schema.ts @@ -1,4 +1,4 @@ -import {Attachment, PublicUserData, TimeStamp} from "./common.schema"; +import {Attachment, PublicUserData, TimeStamp} from './common.schema.js'; export interface GetMessageReq { from: number diff --git a/src/domain/userService.schema.ts b/src/domain/userService.schema.ts index 6cd30ab..1c8d5ba 100644 --- a/src/domain/userService.schema.ts +++ b/src/domain/userService.schema.ts @@ -1,4 +1,4 @@ -import {TimeStamp} from "./common.schema"; +import {TimeStamp} from './common.schema.js'; export interface ChangeUsernameReq { newUsername: string; diff --git a/src/mocks/handlers/auth.http.ts b/src/mocks/handlers/auth.http.ts index cb64d17..0a29dfb 100644 --- a/src/mocks/handlers/auth.http.ts +++ b/src/mocks/handlers/auth.http.ts @@ -5,8 +5,8 @@ import { OtpSendCodeReq, OtpVerifyCodeReq, PleVerifyCodeReq, PleVerifyCodeResp, RegisterReq, SignInSuccessResp, UserDataValidationResp, VerifyPasswordResetReq -} from "../../domain/authService.schema"; -import {GenericSuccessBody} from "../../domain/http.schema"; +} from '../../domain/authService.schema.js'; +import {GenericSuccessBody} from '../../domain/http.schema.js'; export const networkHandlers = [ http.get('*/user/authOptions', () => { diff --git a/src/mocks/handlers/brcChan.http.ts b/src/mocks/handlers/brcChan.http.ts index 92d5d2d..78ed335 100644 --- a/src/mocks/handlers/brcChan.http.ts +++ b/src/mocks/handlers/brcChan.http.ts @@ -1,6 +1,6 @@ import {http, HttpResponse} from "msw"; -import {GetRTCAccessResp} from "../../domain/callService.schema"; -import {StreamRegistry} from "../../domain/broadcastChannelService.schema"; +import {GetRTCAccessResp} from '../../domain/callService.schema.js'; +import {StreamRegistry} from '../../domain/broadcastChannelService.schema.js'; export const brcChanHandlers = [ http.get('*/network/channel/rtmpData', () => { diff --git a/src/mocks/handlers/call.http.ts b/src/mocks/handlers/call.http.ts index 6d90750..bc196f7 100644 --- a/src/mocks/handlers/call.http.ts +++ b/src/mocks/handlers/call.http.ts @@ -1,5 +1,5 @@ import {http, HttpResponse} from "msw"; -import {GetRTCAccessResp} from "../../domain/callService.schema"; +import {GetRTCAccessResp} from '../../domain/callService.schema.js'; export const callHandlers = [ http.post('*/v2/chat/getRTCAccess', () => { diff --git a/src/mocks/handlers/chat.http.ts b/src/mocks/handlers/chat.http.ts index b5cc286..4cfce1a 100644 --- a/src/mocks/handlers/chat.http.ts +++ b/src/mocks/handlers/chat.http.ts @@ -1,5 +1,5 @@ import {http, HttpResponse} from "msw"; -import {Chat, GetAvailabilityResp, StartNewReq} from "../../domain/chatService.schema"; +import {Chat, GetAvailabilityResp, StartNewReq} from '../../domain/chatService.schema.js'; export const chatHandlers = [ http.get('*/chat/get', () => { diff --git a/src/mocks/handlers/dm.http.ts b/src/mocks/handlers/dm.http.ts index 4375405..a66ef71 100644 --- a/src/mocks/handlers/dm.http.ts +++ b/src/mocks/handlers/dm.http.ts @@ -1,7 +1,7 @@ import {http, HttpResponse} from "msw"; -import {Chat} from "../../domain/chatService.schema"; -import {FinishMessageReq, GetMessagePosResp, Message, PinnedMessage} from "../../domain/dmService.schema"; -import {CreateNetworkReq, Network} from "../../domain/networkService.schema"; +import {Chat} from '../../domain/chatService.schema.js'; +import {FinishMessageReq, GetMessagePosResp, Message, PinnedMessage} from '../../domain/dmService.schema.js'; +import {CreateNetworkReq, Network} from '../../domain/networkService.schema.js'; export const dmHandlers = [ http.get('*/chat/dm/messages', () => { diff --git a/src/mocks/handlers/fUpl.http.ts b/src/mocks/handlers/fUpl.http.ts index 2db2347..009baa1 100644 --- a/src/mocks/handlers/fUpl.http.ts +++ b/src/mocks/handlers/fUpl.http.ts @@ -1,6 +1,6 @@ import {http, HttpResponse} from "msw"; -import {GetRTCAccessResp} from "../../domain/callService.schema"; -import {RegisterUploadResp} from "../../domain/fileUploadService.schema"; +import {GetRTCAccessResp} from '../../domain/callService.schema.js'; +import {RegisterUploadResp} from '../../domain/fileUploadService.schema.js'; export const fileUploadHandlers = [ http.post('*/chat/cdnRegisterUpload', () => { diff --git a/src/mocks/handlers/network.http.ts b/src/mocks/handlers/network.http.ts index 5173f23..94441b4 100644 --- a/src/mocks/handlers/network.http.ts +++ b/src/mocks/handlers/network.http.ts @@ -5,8 +5,8 @@ import { Network, NetworkCategory, NetworkInvite, POW -} from "../../domain/networkService.schema"; -import {PublicUserData} from "../../domain/common.schema"; +} from '../../domain/networkService.schema.js'; +import {PublicUserData} from '../../domain/common.schema.js'; export const authHandlers = [ http.get('*/network/invites', () => { diff --git a/src/mocks/handlers/picture.http.ts b/src/mocks/handlers/picture.http.ts index af93f68..6c45e39 100644 --- a/src/mocks/handlers/picture.http.ts +++ b/src/mocks/handlers/picture.http.ts @@ -1,6 +1,6 @@ import {http, HttpResponse} from "msw"; -import {CreateNetworkReq, Network, NetworkInvite} from "../../domain/networkService.schema"; -import {Album, Comment, CreateAlbumReq, GetResp} from "../../domain/pictureService.schema"; +import {CreateNetworkReq, Network, NetworkInvite} from '../../domain/networkService.schema.js'; +import {Album, Comment, CreateAlbumReq, GetResp} from '../../domain/pictureService.schema.js'; export const pictureHandlers = [ http.get('*/picture/pictures', () => { diff --git a/src/mocks/handlers/user.http.ts b/src/mocks/handlers/user.http.ts index 1e94e1e..1481fe5 100644 --- a/src/mocks/handlers/user.http.ts +++ b/src/mocks/handlers/user.http.ts @@ -1,6 +1,6 @@ import {http, HttpResponse} from "msw"; -import {GetResp} from "../../domain/pictureService.schema"; -import {Session} from "../../domain/userService.schema"; +import {GetResp} from '../../domain/pictureService.schema.js'; +import {Session} from '../../domain/userService.schema.js'; export const userHandler = [ http.post('*/user/getSessions', () => { diff --git a/src/mocks/index.ts b/src/mocks/index.ts index 3cf79df..e25d0d4 100644 --- a/src/mocks/index.ts +++ b/src/mocks/index.ts @@ -1,12 +1,12 @@ -import {networkHandlers} from "./handlers/auth.http"; -import {authHandlers} from "./handlers/network.http"; -import {pictureHandlers} from "./handlers/picture.http"; -import {callHandlers} from "./handlers/call.http"; -import {fileUploadHandlers} from "./handlers/fUpl.http"; -import {chatHandlers} from "./handlers/chat.http"; -import {dmHandlers} from "./handlers/dm.http"; -import {userHandler} from "./handlers/user.http"; -import {brcChanHandlers} from "./handlers/brcChan.http"; +import {networkHandlers} from './handlers/auth.http.js'; +import {authHandlers} from './handlers/network.http.js'; +import {pictureHandlers} from './handlers/picture.http.js'; +import {callHandlers} from './handlers/call.http.js'; +import {fileUploadHandlers} from './handlers/fUpl.http.js'; +import {chatHandlers} from './handlers/chat.http.js'; +import {dmHandlers} from './handlers/dm.http.js'; +import {userHandler} from './handlers/user.http.js'; +import {brcChanHandlers} from './handlers/brcChan.http.js'; export const allHandlers = [ ...authHandlers, diff --git a/src/mocks/node.ts b/src/mocks/node.ts index b575f58..d0a25f8 100644 --- a/src/mocks/node.ts +++ b/src/mocks/node.ts @@ -1,4 +1,4 @@ import {setupServer} from "msw/node"; -import {allHandlers} from "./index"; +import {allHandlers} from './index.js'; export const mockServer = setupServer(...allHandlers) \ No newline at end of file diff --git a/src/mocks/storage/database.ts b/src/mocks/storage/database.ts index faea0a5..6fee6b3 100644 --- a/src/mocks/storage/database.ts +++ b/src/mocks/storage/database.ts @@ -1,4 +1,4 @@ -import {DatabaseAPI} from "../../storage/database"; +import {DatabaseAPI} from '../../storage/database.js'; export class DatabaseMock implements DatabaseAPI { database: { [collection: string]: { [key: string]: string } } = {}; diff --git a/src/mocks/storage/keyring.ts b/src/mocks/storage/keyring.ts index 48a6242..f03b5c4 100644 --- a/src/mocks/storage/keyring.ts +++ b/src/mocks/storage/keyring.ts @@ -1,4 +1,4 @@ -import {KeyringAPI} from "../../storage/keyring"; +import {KeyringAPI} from '../../storage/keyring.js'; export class KeyringMock implements KeyringAPI { ring: { [key: string]: string } = {}; diff --git a/src/services/authService.test.ts b/src/services/authService.test.ts index 33d8cc3..b543b4a 100644 --- a/src/services/authService.test.ts +++ b/src/services/authService.test.ts @@ -1,6 +1,6 @@ import {describe, expect, it} from "vitest"; -import {AuthService} from "./authService"; -import {VerificationTypeEmail} from "../domain/authService.schema"; +import {AuthService} from './authService.js'; +import {VerificationTypeEmail} from '../domain/authService.schema.js'; import {faker} from "@faker-js/faker/locale/en"; describe("AuthService", () => { diff --git a/src/services/authService.ts b/src/services/authService.ts index c93fa45..f38cffa 100644 --- a/src/services/authService.ts +++ b/src/services/authService.ts @@ -1,4 +1,4 @@ -import {getClient} from "../core/http"; +import {getClient} from '../core/http.js'; import { AuthMethods, FinishPleAccountReq, LoginPasswordAuthReq, LoginWithApple, LoginWithGoogleReq, OtpPleCodeSendTestingResp, @@ -6,9 +6,9 @@ import { OtpVerifyCodeReq, PleSendCodeReq, PleVerifyCodeReq, PleVerifyCodeResp, RegisterReq, ResetPasswordReq, ResetPasswordResp, SignInSuccessResp, UserDataValidationResp, VerifyPasswordResetReq -} from "../domain/authService.schema"; +} from '../domain/authService.schema.js'; import {isAxiosError} from "axios"; -import {GenericErrorBody, GenericSuccessBody} from "../domain/http.schema"; +import {GenericErrorBody, GenericSuccessBody} from '../domain/http.schema.js'; export class AuthService { /** diff --git a/src/services/broadcastChannelService.test.ts b/src/services/broadcastChannelService.test.ts index 5bea8b1..eaa85ee 100644 --- a/src/services/broadcastChannelService.test.ts +++ b/src/services/broadcastChannelService.test.ts @@ -1,5 +1,5 @@ import {describe, expect, it} from "vitest"; -import {BroadcastChannelService} from "./broadcastChannelService"; +import {BroadcastChannelService} from './broadcastChannelService.js'; describe("BroadcastChannelService", () => { const service = new BroadcastChannelService("", "", "", "", "", () => {}) diff --git a/src/services/broadcastChannelService.ts b/src/services/broadcastChannelService.ts index ddc04e4..83e1668 100644 --- a/src/services/broadcastChannelService.ts +++ b/src/services/broadcastChannelService.ts @@ -1,15 +1,15 @@ import {AxiosInstance, isAxiosError} from "axios"; -import {getClient} from "../core/http"; -import {MessageListener} from "../domain/websocket.schema"; -import {WebSocketHandler} from "../core/webSocketHandler"; -import {AcceptInviteReq} from "../domain/networkService.schema"; -import {GenericErrorBody} from "../domain/http.schema"; +import {getClient} from '../core/http.js'; +import {MessageListener} from '../domain/websocket.schema.js'; +import {WebSocketHandler} from '../core/webSocketHandler.js'; +import {AcceptInviteReq} from '../domain/networkService.schema.js'; +import {GenericErrorBody} from '../domain/http.schema.js'; import { CreateServerReq, GetRTMPDataReq, JoinWebsocketRoomReq, StreamRegistry -} from "../domain/broadcastChannelService.schema"; +} from '../domain/broadcastChannelService.schema.js'; export class BroadcastChannelService { userid: string diff --git a/src/services/callService.test.ts b/src/services/callService.test.ts index 7819717..1c00f23 100644 --- a/src/services/callService.test.ts +++ b/src/services/callService.test.ts @@ -1,5 +1,5 @@ import {describe, expect, it} from "vitest"; -import {CallService} from "./callService"; +import {CallService} from './callService.js'; describe("CallService", () => { const handler = new CallService("", "") diff --git a/src/services/callService.ts b/src/services/callService.ts index 249d58d..f40dd9f 100644 --- a/src/services/callService.ts +++ b/src/services/callService.ts @@ -1,8 +1,8 @@ -import {getClient} from "../core/http"; -import {OtpPleCodeSendTestingResp, OtpSendCodeReq} from "../domain/authService.schema"; +import {getClient} from '../core/http.js'; +import {OtpPleCodeSendTestingResp, OtpSendCodeReq} from '../domain/authService.schema.js'; import {isAxiosError} from "axios"; -import {GenericErrorBody} from "../domain/http.schema"; -import {GetRTCAccessReq, GetRTCAccessResp, InviteToCallReq} from "../domain/callService.schema"; +import {GenericErrorBody} from '../domain/http.schema.js'; +import {GetRTCAccessReq, GetRTCAccessResp, InviteToCallReq} from '../domain/callService.schema.js'; export class CallService { userid: string; diff --git a/src/services/chatService.test.ts b/src/services/chatService.test.ts index fcfdc38..cdd17dd 100644 --- a/src/services/chatService.test.ts +++ b/src/services/chatService.test.ts @@ -1,6 +1,6 @@ import {describe, expect, it} from "vitest"; -import {ChatService} from "./chatService"; -import {DatabaseMock} from "../mocks/storage/database"; +import {ChatService} from './chatService.js'; +import {DatabaseMock} from '../mocks/storage/database.js'; import {faker} from "@faker-js/faker/locale/en"; describe("ChatService", () => { diff --git a/src/services/chatService.ts b/src/services/chatService.ts index f44db01..327b249 100644 --- a/src/services/chatService.ts +++ b/src/services/chatService.ts @@ -1,18 +1,18 @@ -import {DatabaseAPI} from "../storage/database"; -import {MessageListener} from "../domain/websocket.schema"; -import {getClient} from "../core/http"; -import {WebSocketHandler} from "../core/webSocketHandler"; +import {DatabaseAPI} from '../storage/database.js'; +import {MessageListener} from '../domain/websocket.schema.js'; +import {getClient} from '../core/http.js'; +import {WebSocketHandler} from '../core/webSocketHandler.js'; import {AxiosInstance, isAxiosError} from "axios"; -import {NetworkInvite} from "../domain/networkService.schema"; -import {GenericErrorBody} from "../domain/http.schema"; +import {NetworkInvite} from '../domain/networkService.schema.js'; +import {GenericErrorBody} from '../domain/http.schema.js'; import { Chat, GetAvailabilityReq, GetAvailabilityResp, StartNewReq, ToggleChatMuteReq -} from "../domain/chatService.schema"; -import {Message} from "../domain/dmService.schema"; +} from '../domain/chatService.schema.js'; +import {Message} from '../domain/dmService.schema.js'; /** * ChatService is an exception because it's one instance for all chats because it's unnecessary to create a new instance for each chat diff --git a/src/services/dmService.test.ts b/src/services/dmService.test.ts index b2ca79a..b12bc12 100644 --- a/src/services/dmService.test.ts +++ b/src/services/dmService.test.ts @@ -1,6 +1,6 @@ import {describe, expect, it} from "vitest"; -import {DMService} from "./dmService"; -import {DatabaseMock} from "../mocks/storage/database"; +import {DMService} from './dmService.js'; +import {DatabaseMock} from '../mocks/storage/database.js'; import {faker} from "@faker-js/faker/locale/en"; describe("DmService", () => { diff --git a/src/services/dmService.ts b/src/services/dmService.ts index 1745602..0be7a36 100644 --- a/src/services/dmService.ts +++ b/src/services/dmService.ts @@ -1,8 +1,8 @@ -import {DatabaseAPI} from "../storage/database"; +import {DatabaseAPI} from '../storage/database.js'; import {AxiosInstance, isAxiosError} from "axios"; -import {MessageListener} from "../domain/websocket.schema"; -import {getClient} from "../core/http"; -import {WebSocketHandler} from "../core/webSocketHandler"; +import {MessageListener} from '../domain/websocket.schema.js'; +import {getClient} from '../core/http.js'; +import {WebSocketHandler} from '../core/webSocketHandler.js'; import { DeleteMessagesReq, EditMessageReq, @@ -10,11 +10,11 @@ import { GetMessagePosResp, JoinWsRoomReq, Message, PinMessageReq, PinnedMessage, ReadMessagesReq, UnpinMessageReq -} from "../domain/dmService.schema"; -import {NetworkInvite} from "../domain/networkService.schema"; -import {GenericErrorBody} from "../domain/http.schema"; -import {FileData, FileUploadProgressListener} from "../domain/fileUploadService.schema"; -import {FileUploadService} from "./fileUploadService"; +} from '../domain/dmService.schema.js'; +import {NetworkInvite} from '../domain/networkService.schema.js'; +import {GenericErrorBody} from '../domain/http.schema.js'; +import {FileData, FileUploadProgressListener} from '../domain/fileUploadService.schema.js'; +import {FileUploadService} from './fileUploadService.js'; export class DMService { userid: string; diff --git a/src/services/fileTransferService.ts b/src/services/fileTransferService.ts index 9950605..c7a2d6a 100644 --- a/src/services/fileTransferService.ts +++ b/src/services/fileTransferService.ts @@ -1,17 +1,17 @@ -import {DatabaseAPI} from "../storage/database"; +import {DatabaseAPI} from '../storage/database.js'; import {AxiosInstance, isAxiosError} from "axios"; -import {MessageListener} from "../domain/websocket.schema"; -import {getClient} from "../core/http"; -import {WebSocketHandler} from "../core/webSocketHandler"; -import {CreateNetworkReq, Network} from "../domain/networkService.schema"; -import {GenericErrorBody} from "../domain/http.schema"; +import {MessageListener} from '../domain/websocket.schema.js'; +import {getClient} from '../core/http.js'; +import {WebSocketHandler} from '../core/webSocketHandler.js'; +import {CreateNetworkReq, Network} from '../domain/networkService.schema.js'; +import {GenericErrorBody} from '../domain/http.schema.js'; import { AcceptFileTransferReq, DeclineFileTransferReq, FileTransferSendAnswerRTCReq, FileTransferSendICERTCReq, FileTransferSendOfferRTCReq, StartNewFileTransferReq, StartNewFileTransferResp, TransferableFileMetadata -} from "../domain/fileTransferService.schema"; +} from '../domain/fileTransferService.schema.js'; export class FileTransferService { userid: string; diff --git a/src/services/fileUploadService.test.ts b/src/services/fileUploadService.test.ts index 06b21c1..8ac08a4 100644 --- a/src/services/fileUploadService.test.ts +++ b/src/services/fileUploadService.test.ts @@ -1,5 +1,5 @@ import {describe, expect, it} from "vitest"; -import {FileUploadService} from "./fileUploadService"; +import {FileUploadService} from './fileUploadService.js'; describe("fileUploadService", () => { it('should upload files', async () => { diff --git a/src/services/fileUploadService.ts b/src/services/fileUploadService.ts index 0f502fd..e3e001a 100644 --- a/src/services/fileUploadService.ts +++ b/src/services/fileUploadService.ts @@ -4,11 +4,11 @@ import { FileUploadRegistration, FinishUploadReq, RegisterUploadReq, RegisterUploadResp -} from "../domain/fileUploadService.schema"; +} from '../domain/fileUploadService.schema.js'; import {AxiosInstance, isAxiosError} from "axios"; -import {getClient} from "../core/http"; -import {InviteToCallReq} from "../domain/callService.schema"; -import {GenericErrorBody} from "../domain/http.schema"; +import {getClient} from '../core/http.js'; +import {InviteToCallReq} from '../domain/callService.schema.js'; +import {GenericErrorBody} from '../domain/http.schema.js'; import {v4 as uuidv4} from 'uuid'; export class FileUploadService { diff --git a/src/services/networkService.test.ts b/src/services/networkService.test.ts index 7c1363a..194a76b 100644 --- a/src/services/networkService.test.ts +++ b/src/services/networkService.test.ts @@ -1,9 +1,9 @@ import {describe, expect, it} from "vitest"; -import {NetworkService} from "./networkService"; -import {DatabaseMock} from "../mocks/storage/database"; +import {NetworkService} from './networkService.js'; +import {DatabaseMock} from '../mocks/storage/database.js'; import {faker} from "@faker-js/faker/locale/en"; -import {getClient} from "../core/http"; -import {environment, SDKConfig} from "../core/environment"; +import {getClient} from '../core/http.js'; +import {environment, SDKConfig} from '../core/environment.js'; describe("NetworkService", () => { const service = new NetworkService("", "", "", new DatabaseMock(), (action, data) => {}) diff --git a/src/services/networkService.ts b/src/services/networkService.ts index c8452f0..734abce 100644 --- a/src/services/networkService.ts +++ b/src/services/networkService.ts @@ -1,7 +1,7 @@ -import {DatabaseAPI} from "../storage/database"; -import {getClient} from "../core/http"; +import {DatabaseAPI} from '../storage/database.js'; +import {getClient} from '../core/http.js'; import {AxiosInstance, isAxiosError} from "axios"; -import {GenericErrorBody} from "../domain/http.schema"; +import {GenericErrorBody} from '../domain/http.schema.js'; import { AcceptInviteReq, AssignRankToMemberReq, BanMemberReq, ChangeVisibilityReq, CreateCategoryReq, CreateChannelReq, CreateInviteReq, @@ -15,11 +15,11 @@ import { NetworkInvite, NetworkRank, OverwriteChannelPermissionReq, OverwritePermissionReq, PermissionUpdate, POW, RemoveRankFromMemberReq, ToggleCategoryMuteReq, ToggleChannelNetworkMuteReq, ToggleNetworkMuteReq, UnbanMemberReq, UploadNewPictureReq -} from "../domain/networkService.schema"; -import {PublicUserData, RGB} from "../domain/common.schema"; -import {WebSocketHandler} from "../core/webSocketHandler"; -import {MessageListener} from "../domain/websocket.schema"; -import {Message} from "../domain/dmService.schema"; +} from '../domain/networkService.schema.js'; +import {PublicUserData, RGB} from '../domain/common.schema.js'; +import {WebSocketHandler} from '../core/webSocketHandler.js'; +import {MessageListener} from '../domain/websocket.schema.js'; +import {Message} from '../domain/dmService.schema.js'; export class NetworkService { userid: string; diff --git a/src/services/pictureService.test.ts b/src/services/pictureService.test.ts index 31ff204..ae4ce32 100644 --- a/src/services/pictureService.test.ts +++ b/src/services/pictureService.test.ts @@ -1,6 +1,6 @@ import {describe, expect, it} from "vitest"; -import {PictureService} from "./pictureService"; -import {DatabaseMock} from "../mocks/storage/database"; +import {PictureService} from './pictureService.js'; +import {DatabaseMock} from '../mocks/storage/database.js'; import {faker} from "@faker-js/faker/locale/en"; describe("PictureService", () => { diff --git a/src/services/pictureService.ts b/src/services/pictureService.ts index badb2fe..63d6ff9 100644 --- a/src/services/pictureService.ts +++ b/src/services/pictureService.ts @@ -1,8 +1,8 @@ -import {DatabaseAPI} from "../storage/database"; +import {DatabaseAPI} from '../storage/database.js'; import {AxiosInstance, isAxiosError} from "axios"; -import {getClient} from "../core/http"; -import {NetworkInvite} from "../domain/networkService.schema"; -import {GenericErrorBody} from "../domain/http.schema"; +import {getClient} from '../core/http.js'; +import {NetworkInvite} from '../domain/networkService.schema.js'; +import {GenericErrorBody} from '../domain/http.schema.js'; import { Album, ChangePictureVisibilityReq, Comment, CreateAlbumReq, @@ -10,9 +10,9 @@ import { DiscoveryResp, EditPictureTitleReq, FinalizeUploadReq, GetResp, PostCommentReq, ToggleFollowReq, TogglePictureLikeReq, UploadImageReq -} from "../domain/pictureService.schema"; -import {environment} from "../core/environment"; -import {Message} from "../domain/dmService.schema"; +} from '../domain/pictureService.schema.js'; +import {environment} from '../core/environment.js'; +import {Message} from '../domain/dmService.schema.js'; export class PictureService { userid: string; diff --git a/src/services/sessionManager.ts b/src/services/sessionManager.ts index 8b49472..b11fe27 100644 --- a/src/services/sessionManager.ts +++ b/src/services/sessionManager.ts @@ -1,11 +1,11 @@ -import {PublicUserData} from "../domain/common.schema"; -import {DatabaseAPI} from "../storage/database"; -import {KeyringAPI} from "../storage/keyring"; -import {KeyValueAPI} from "../storage/keyvalue"; -import {Session, ValidateSessionReq, ValidateSessionResp} from "../domain/sessionManager.schema"; +import {PublicUserData} from '../domain/common.schema.js'; +import {DatabaseAPI} from '../storage/database.js'; +import {KeyringAPI} from '../storage/keyring.js'; +import {KeyValueAPI} from '../storage/keyvalue.js'; +import {Session, ValidateSessionReq, ValidateSessionResp} from '../domain/sessionManager.schema.js'; import {AxiosInstance} from "axios"; -import {getClient} from "../core/http"; -import {PersonalUserData} from "../domain/userService.schema"; +import {getClient} from '../core/http.js'; +import {PersonalUserData} from '../domain/userService.schema.js'; export class SessionManager { client: AxiosInstance; diff --git a/src/services/textChannelService.ts b/src/services/textChannelService.ts index 5964607..3c91b13 100644 --- a/src/services/textChannelService.ts +++ b/src/services/textChannelService.ts @@ -1,8 +1,8 @@ -import {DatabaseAPI} from "../storage/database"; +import {DatabaseAPI} from '../storage/database.js'; import {AxiosInstance, isAxiosError} from "axios"; -import {MessageListener} from "../domain/websocket.schema"; -import {getClient} from "../core/http"; -import {WebSocketHandler} from "../core/webSocketHandler"; +import {MessageListener} from '../domain/websocket.schema.js'; +import {getClient} from '../core/http.js'; +import {WebSocketHandler} from '../core/webSocketHandler.js'; import { DeleteMessagesReq, EditMessageReq, @@ -10,11 +10,11 @@ import { GetMessagePosResp, JoinWsRoomReq, Message, PinMessageReq, PinnedMessage, ReadMessagesReq, UnpinMessageReq -} from "../domain/textChannelService.schema"; -import {NetworkInvite} from "../domain/networkService.schema"; -import {GenericErrorBody} from "../domain/http.schema"; -import {FileData, FileUploadProgressListener} from "../domain/fileUploadService.schema"; -import {FileUploadService} from "./fileUploadService"; +} from '../domain/textChannelService.schema.js'; +import {NetworkInvite} from '../domain/networkService.schema.js'; +import {GenericErrorBody} from '../domain/http.schema.js'; +import {FileData, FileUploadProgressListener} from '../domain/fileUploadService.schema.js'; +import {FileUploadService} from './fileUploadService.js'; export class TextChannelServiceService { userid: string; diff --git a/src/services/userService.test.ts b/src/services/userService.test.ts index 075a139..5b2514b 100644 --- a/src/services/userService.test.ts +++ b/src/services/userService.test.ts @@ -1,6 +1,6 @@ import {describe, expect, it} from "vitest"; -import {UserService} from "./userService"; -import {DatabaseMock} from "../mocks/storage/database"; +import {UserService} from './userService.js'; +import {DatabaseMock} from '../mocks/storage/database.js'; describe("UserService", () => { const service = new UserService("", "", new DatabaseMock()) diff --git a/src/services/userService.ts b/src/services/userService.ts index c4ea931..1088b1e 100644 --- a/src/services/userService.ts +++ b/src/services/userService.ts @@ -1,10 +1,10 @@ -import {DatabaseAPI} from "../storage/database"; +import {DatabaseAPI} from '../storage/database.js'; import {AxiosInstance, isAxiosError} from "axios"; -import {MessageListener} from "../domain/websocket.schema"; -import {getClient} from "../core/http"; -import {WebSocketHandler} from "../core/webSocketHandler"; -import {DeleteCategoryReq} from "../domain/networkService.schema"; -import {GenericErrorBody} from "../domain/http.schema"; +import {MessageListener} from '../domain/websocket.schema.js'; +import {getClient} from '../core/http.js'; +import {WebSocketHandler} from '../core/webSocketHandler.js'; +import {DeleteCategoryReq} from '../domain/networkService.schema.js'; +import {GenericErrorBody} from '../domain/http.schema.js'; import { ChangeDisplayNameReq, ChangeEmailReq, @@ -12,9 +12,9 @@ import { ChangeUsernameReq, CurrNewCodeTestingResp, DeleteReq, GetSessionsReq, GIF, RegisterFCMTokenReq, Session, ToggleGifSaveReq, UploadNewPfpCdnReq, UploadNewPfpCdnResp, UploadNewPfpReq, VerifyMailChangeReq, VerifyPhoneChange -} from "../domain/userService.schema"; -import {RGB} from "../domain/common.schema"; -import {OtpPleCodeSendTestingResp} from "../domain/authService.schema"; +} from '../domain/userService.schema.js'; +import {RGB} from '../domain/common.schema.js'; +import {OtpPleCodeSendTestingResp} from '../domain/authService.schema.js'; export class UserService { userid: string; diff --git a/src/vitest.setup.unit.ts b/src/vitest.setup.unit.ts index 66e5350..41a707f 100644 --- a/src/vitest.setup.unit.ts +++ b/src/vitest.setup.unit.ts @@ -1,5 +1,5 @@ import {beforeAll, afterEach, afterAll, vi} from 'vitest'; -import {mockServer} from "./mocks/node"; +import {mockServer} from './mocks/node.js'; beforeAll(() => mockServer.listen({onUnhandledRequest: 'error'})); afterEach(() => mockServer.resetHandlers()); diff --git a/tests/authService.test.ts b/tests/authService.test.ts index c7c3a3f..556c0ca 100644 --- a/tests/authService.test.ts +++ b/tests/authService.test.ts @@ -1,6 +1,6 @@ import {describe, expect, it} from "vitest"; -import {AuthService} from "../src/services/authService"; -import {VerificationTypeEmail} from "../src/domain/authService.schema"; +import {AuthService} from '../src/services/authService.js'; +import {VerificationTypeEmail} from '../src/domain/authService.schema.js'; describe("AuthService", () => { it("should return authMethods", async () => { diff --git a/tests/broadcastChannelService.test.ts b/tests/broadcastChannelService.test.ts index 3a9e43a..65898a2 100644 --- a/tests/broadcastChannelService.test.ts +++ b/tests/broadcastChannelService.test.ts @@ -1,5 +1,5 @@ import {describe, expect, it} from "vitest"; -import {BroadcastChannelService} from "../src/services/broadcastChannelService"; +import {BroadcastChannelService} from '../src/services/broadcastChannelService.js'; const BRC_CHAN_SERVICE_TESTING_NETWORK_ID = "000000000000000000000000" const BRC_CHAN_SERVICE_TESTING_USER_ID = "000000000000000000000000" diff --git a/tests/chatsService.test.ts b/tests/chatsService.test.ts index fbb46d9..ce558fe 100644 --- a/tests/chatsService.test.ts +++ b/tests/chatsService.test.ts @@ -1,6 +1,6 @@ import {describe, expect, it} from "vitest"; -import {DatabaseMock} from "../src/mocks/storage/database"; -import {ChatService} from "../src/services/chatService"; +import {DatabaseMock} from '../src/mocks/storage/database.js'; +import {ChatService} from '../src/services/chatService.js'; describe("ChatService Integration Testing", () => { const CHAT_SERVICE_TESTING_USER_ID = "000000000000000000000000" diff --git a/tests/dmService.test.ts b/tests/dmService.test.ts index 675faad..2e9bdde 100644 --- a/tests/dmService.test.ts +++ b/tests/dmService.test.ts @@ -1,7 +1,7 @@ import {describe, expect, it} from "vitest"; -import {DMService} from "../src/services/dmService"; -import {ChatService} from "../src/services/chatService"; -import {DatabaseMock} from "../src/mocks/storage/database"; +import {DMService} from '../src/services/dmService.js'; +import {ChatService} from '../src/services/chatService.js'; +import {DatabaseMock} from '../src/mocks/storage/database.js'; import {faker} from "@faker-js/faker/locale/en"; describe("DmService Integration Testing", () => { diff --git a/tests/fileUploadService.test.ts b/tests/fileUploadService.test.ts index 98dac0c..ed5ebab 100644 --- a/tests/fileUploadService.test.ts +++ b/tests/fileUploadService.test.ts @@ -1,8 +1,8 @@ import {describe, it} from "vitest"; -import {FileUploadService} from "../src/services/fileUploadService"; -import {environment, SDKConfig} from "../src/core/environment"; -import {getClient} from "../src/core/http"; -import {FileData} from "../src/domain/fileUploadService.schema"; +import {FileUploadService} from '../src/services/fileUploadService.js'; +import {environment, SDKConfig} from '../src/core/environment.js'; +import {getClient} from '../src/core/http.js'; +import {FileData} from '../src/domain/fileUploadService.schema.js'; import axios from "axios"; import {v4 as uuidv4} from 'uuid'; diff --git a/tests/networkService.test.ts b/tests/networkService.test.ts index b9f60ba..0c25e0d 100644 --- a/tests/networkService.test.ts +++ b/tests/networkService.test.ts @@ -1,12 +1,12 @@ import {describe, expect, it} from "vitest"; -import {NetworkService} from "../src/services/networkService"; -import {DatabaseMock} from "../src/mocks/storage/database"; -import {environment, SDKConfig} from "../src/core/environment"; -import {getClient} from "../src/core/http"; +import {NetworkService} from '../src/services/networkService.js'; +import {DatabaseMock} from '../src/mocks/storage/database.js'; +import {environment, SDKConfig} from '../src/core/environment.js'; +import {getClient} from '../src/core/http.js'; import {faker} from "@faker-js/faker/locale/en"; -import {AuthService} from "../src/services/authService"; -import {RGB} from "../src/domain/common.schema"; -import {NetworkPermissions, PermissionUpdate} from "../src/domain/networkService.schema"; +import {AuthService} from '../src/services/authService.js'; +import {RGB} from '../src/domain/common.schema.js'; +import {NetworkPermissions, PermissionUpdate} from '../src/domain/networkService.schema.js'; const NETWORK_SERVICE_TESTING_NETWORK_ID = "000000000000000000000000" const NETWORK_SERVICE_TESTING_USER_ID = "000000000000000000000000" diff --git a/tests/pictureService.test.ts b/tests/pictureService.test.ts index f844d68..9101898 100644 --- a/tests/pictureService.test.ts +++ b/tests/pictureService.test.ts @@ -1,9 +1,9 @@ import {describe, expect, it} from "vitest"; -import {environment, SDKConfig} from "../src/core/environment"; -import {NetworkService} from "../src/services/networkService"; -import {DatabaseMock} from "../src/mocks/storage/database"; -import {getClient} from "../src/core/http"; -import {PictureService} from "../src/services/pictureService"; +import {environment, SDKConfig} from '../src/core/environment.js'; +import {NetworkService} from '../src/services/networkService.js'; +import {DatabaseMock} from '../src/mocks/storage/database.js'; +import {getClient} from '../src/core/http.js'; +import {PictureService} from '../src/services/pictureService.js'; import {faker} from "@faker-js/faker/locale/en"; const PICTURE_SERVICE_TESTING_TOKEN = "testingToken" diff --git a/tests/textChannelService.test.ts b/tests/textChannelService.test.ts index 70c5a07..add901f 100644 --- a/tests/textChannelService.test.ts +++ b/tests/textChannelService.test.ts @@ -1,9 +1,9 @@ import {describe, expect, it} from "vitest"; -import {DMService} from "../src/services/dmService"; -import {ChatService} from "../src/services/chatService"; -import {DatabaseMock} from "../src/mocks/storage/database"; +import {DMService} from '../src/services/dmService.js'; +import {ChatService} from '../src/services/chatService.js'; +import {DatabaseMock} from '../src/mocks/storage/database.js'; import {faker} from "@faker-js/faker/locale/en"; -import {TextChannelServiceService} from "../src/services/textChannelService"; +import {TextChannelServiceService} from '../src/services/textChannelService.js'; describe("DmService Integration Testing", () => { const TXT_CHAN_SERVICE_TESTING_CHANNEL_ID = "222222222222222222222222" diff --git a/tests/userService.test.ts b/tests/userService.test.ts index b0ebab8..2ddd419 100644 --- a/tests/userService.test.ts +++ b/tests/userService.test.ts @@ -1,7 +1,7 @@ import {describe, expect, it} from "vitest"; -import {UserService} from "../src/services/userService"; -import {DatabaseMock} from "../src/mocks/storage/database"; -import {RGB} from "../src/domain/common.schema" +import {UserService} from '../src/services/userService.js'; +import {DatabaseMock} from '../src/mocks/storage/database.js'; +import {RGB} from '../src/domain/common.schema.js' const USER_SERVICE_TESTING_USER_ID = "000000000000000000000000" const USER_SERVICE_TESTING_TOKEN = "testingToken" diff --git a/tests/vitest.setup.integration.ts b/tests/vitest.setup.integration.ts index 96e5172..64a08b9 100644 --- a/tests/vitest.setup.integration.ts +++ b/tests/vitest.setup.integration.ts @@ -1,6 +1,6 @@ import {beforeAll, beforeEach} from 'vitest'; -import {environment, SDKConfig} from "../src/core/environment"; -import {getClient} from "../src/core/http"; +import {environment, SDKConfig} from '../src/core/environment.js'; +import {getClient} from '../src/core/http.js'; beforeEach(async () => { await getClient(false).post("v2/reset") diff --git a/tests/webSocketHandler.test.ts b/tests/webSocketHandler.test.ts index 2623182..742edea 100644 --- a/tests/webSocketHandler.test.ts +++ b/tests/webSocketHandler.test.ts @@ -1,5 +1,5 @@ import {describe, it} from "vitest"; -import {WebSocketHandler} from "../src/core/webSocketHandler"; +import {WebSocketHandler} from '../src/core/webSocketHandler.js'; const WEBSOCKET_HANDLER_TESTING_USER_ID = "000000000000000000000000" const WEBSOCKET_HANDLER_TESTING_USER_TOKEN = "testingToken" diff --git a/tsconfig.json b/tsconfig.json index d21d071..367e853 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { "target": "es2016", "module": "NodeNext", - "moduleResolution": "NodeNext", + "moduleResolution": "nodenext", "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "declaration": true,