Compare commits
2 Commits
1.0.3
...
6f3400baec
| Author | SHA1 | Date | |
|---|---|---|---|
| 6f3400baec | |||
| 64cac8bede |
@@ -1,2 +0,0 @@
|
||||
API_URL=https://api.chatenium.hu
|
||||
CDN_URL=https://cdn.chatenium.hu
|
||||
@@ -1,30 +0,0 @@
|
||||
name: Publish to NPM
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
release:
|
||||
types: [published]
|
||||
|
||||
jobs:
|
||||
build-and-publish:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Node.js
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: "24"
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
|
||||
- name: Build TypeScript
|
||||
run: npm run build
|
||||
|
||||
- name: Add NPM token
|
||||
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
|
||||
|
||||
- name: Publish to NPM
|
||||
run: npm publish --access public
|
||||
@@ -1,57 +0,0 @@
|
||||
name: Setup testing environment and test the code
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches: [ "main" ]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
services:
|
||||
mongodb:
|
||||
image: mongo:6.0
|
||||
|
||||
redis:
|
||||
image: redis:7-alpine
|
||||
|
||||
api:
|
||||
image: git.chatenium.hu/chatenium/api:latest
|
||||
credentials:
|
||||
username: ${{ secrets.REPO_USER }}
|
||||
password: ${{ secrets.REPO_TOKEN }}
|
||||
env:
|
||||
ENVIRONMENT_TYPE: "testing"
|
||||
MONGODB_URL: mongodb://mongodb:27017
|
||||
REDIS_SERVER_ADDR: redis:6379
|
||||
|
||||
cdn:
|
||||
image: git.chatenium.hu/chatenium/cdn:latest
|
||||
credentials:
|
||||
username: ${{ secrets.REPO_USER }}
|
||||
password: ${{ secrets.REPO_TOKEN }}
|
||||
env:
|
||||
ENVIRONMENT: "testing"
|
||||
REDIS_SERVER_ADDR: redis:6379
|
||||
MAIN_API_URL: http://api:3000
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '24'
|
||||
|
||||
- name: Create .env file
|
||||
run: |
|
||||
echo "API_URL=http://api:3000" >> .env
|
||||
echo "CDN_URL=http://cdn:4000" >> .env
|
||||
echo "WS_URL=ws://api:3000" >> .env
|
||||
|
||||
- name: Run Vitest
|
||||
run: |
|
||||
npm install
|
||||
npm test --experimental-websocket
|
||||
7
.gitignore
vendored
7
.gitignore
vendored
@@ -9,9 +9,4 @@ yarn-error.log*
|
||||
.pnp.js
|
||||
|
||||
.vscode/*
|
||||
.idea/*
|
||||
.DS_Store
|
||||
.env
|
||||
.env.*
|
||||
!.env.example
|
||||
/dist
|
||||
.idea/*
|
||||
23
LICENSE
23
LICENSE
@@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
Chatenium SDK TypeScript
|
||||
Copyright (C) 2026 Chatenium
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@@ -647,6 +647,25 @@ the "copyright" line and a pointer to where the full notice is found.
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
Chatenium Copyright (C) 2026 Chatenium
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
<https://www.gnu.org/licenses/>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
# Chatenium SDK For TypeScript
|
||||
A library for interacting with the Chatenium API.
|
||||
## Quick Start
|
||||
```aiignore
|
||||
npm install @chatenium/chatenium-sdk
|
||||
```
|
||||
47
package-lock.json
generated
47
package-lock.json
generated
@@ -10,12 +10,9 @@
|
||||
"dependencies": {
|
||||
"@faker-js/faker": "^10.4.0",
|
||||
"axios": "^1.14.0",
|
||||
"dotenv": "^17.4.0",
|
||||
"msw": "^2.12.14",
|
||||
"uuid": "^13.0.0"
|
||||
"msw": "^2.12.14"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "^25.5.2",
|
||||
"typescript": "^5.5.3",
|
||||
"vitest": "^4.1.2"
|
||||
}
|
||||
@@ -536,16 +533,6 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/node": {
|
||||
"version": "25.5.2",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-25.5.2.tgz",
|
||||
"integrity": "sha512-tO4ZIRKNC+MDWV4qKVZe3Ql/woTnmHDr5JD8UI5hn2pwBrHEwOEMZK7WlNb5RKB6EoJ02gwmQS9OrjuFnZYdpg==",
|
||||
"devOptional": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"undici-types": "~7.18.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/statuses": {
|
||||
"version": "2.0.6",
|
||||
"resolved": "https://registry.npmjs.org/@types/statuses/-/statuses-2.0.6.tgz",
|
||||
@@ -848,18 +835,6 @@
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/dotenv": {
|
||||
"version": "17.4.0",
|
||||
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.4.0.tgz",
|
||||
"integrity": "sha512-kCKF62fwtzwYm0IGBNjRUjtJgMfGapII+FslMHIjMR5KTnwEmBmWLDRSnc3XSNP8bNy34tekgQyDT0hr7pERRQ==",
|
||||
"license": "BSD-2-Clause",
|
||||
"engines": {
|
||||
"node": ">=12"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://dotenvx.com"
|
||||
}
|
||||
},
|
||||
"node_modules/dunder-proto": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
|
||||
@@ -1882,13 +1857,6 @@
|
||||
"node": ">=14.17"
|
||||
}
|
||||
},
|
||||
"node_modules/undici-types": {
|
||||
"version": "7.18.2",
|
||||
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz",
|
||||
"integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==",
|
||||
"devOptional": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/until-async": {
|
||||
"version": "3.0.2",
|
||||
"resolved": "https://registry.npmjs.org/until-async/-/until-async-3.0.2.tgz",
|
||||
@@ -1898,19 +1866,6 @@
|
||||
"url": "https://github.com/sponsors/kettanaito"
|
||||
}
|
||||
},
|
||||
"node_modules/uuid": {
|
||||
"version": "13.0.0",
|
||||
"resolved": "https://registry.npmjs.org/uuid/-/uuid-13.0.0.tgz",
|
||||
"integrity": "sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==",
|
||||
"funding": [
|
||||
"https://github.com/sponsors/broofa",
|
||||
"https://github.com/sponsors/ctavan"
|
||||
],
|
||||
"license": "MIT",
|
||||
"bin": {
|
||||
"uuid": "dist-node/bin/uuid"
|
||||
}
|
||||
},
|
||||
"node_modules/vite": {
|
||||
"version": "8.0.3",
|
||||
"resolved": "https://registry.npmjs.org/vite/-/vite-8.0.3.tgz",
|
||||
|
||||
36
package.json
36
package.json
@@ -1,46 +1,22 @@
|
||||
{
|
||||
"name": "@chatenium/chatenium-sdk",
|
||||
"version": "1.0.3",
|
||||
"description": "A library for interacting with the Chatenium API",
|
||||
"type": "module",
|
||||
"name": "chatenium-sdk",
|
||||
"version": "1.0.0",
|
||||
"description": "",
|
||||
"main": "dist/index.js",
|
||||
"module": "dist/index.js",
|
||||
"types": "dist/index.d.ts",
|
||||
"exports": {
|
||||
".": {
|
||||
"types": "./dist/index.d.ts",
|
||||
"import": "./dist/index.js",
|
||||
"default": "./dist/index.js"
|
||||
},
|
||||
"./core/*": "./dist/core/*.js",
|
||||
"./services/*": "./dist/services/*.js",
|
||||
"./domain/*": "./dist/domain/*.js",
|
||||
"./mocks/*": "./dist/mocks/*.js",
|
||||
"./storage/*": "./dist/storage/*.js"
|
||||
},
|
||||
"files": [
|
||||
"dist",
|
||||
"README.md",
|
||||
"LICENSE"
|
||||
],
|
||||
"scripts": {
|
||||
"build": "tsc",
|
||||
"test": "vitest run",
|
||||
"test-unit": "vitest run --project unit",
|
||||
"test": "vitest run --project unit",
|
||||
"test-integration": "vitest run --project integration",
|
||||
"test:watch": "vitest"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "^25.5.2",
|
||||
"typescript": "^5.5.3",
|
||||
"vitest": "^4.1.2"
|
||||
},
|
||||
"private": false,
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@faker-js/faker": "^10.4.0",
|
||||
"axios": "^1.14.0",
|
||||
"dotenv": "^17.4.0",
|
||||
"msw": "^2.12.14",
|
||||
"uuid": "^13.0.0"
|
||||
"msw": "^2.12.14"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,47 +1,21 @@
|
||||
export interface SDKConfig {
|
||||
apiUrl: string;
|
||||
cdnUrl: string;
|
||||
wsUrl: string;
|
||||
}
|
||||
|
||||
declare const process: any;
|
||||
declare const require: any;
|
||||
|
||||
const isNode =
|
||||
typeof process !== 'undefined' &&
|
||||
typeof process.versions !== 'undefined' &&
|
||||
typeof process.versions.node !== 'undefined';
|
||||
|
||||
if (isNode) {
|
||||
try {
|
||||
require('dotenv').config();
|
||||
} catch { }
|
||||
}
|
||||
|
||||
const getEnv = (key: string): string | undefined => {
|
||||
if (!isNode) return undefined;
|
||||
return process.env?.[key];
|
||||
};
|
||||
|
||||
const DefaultEnvironment: SDKConfig = {
|
||||
apiUrl: getEnv('API_URL') ?? "https://api.chatenium.hu",
|
||||
cdnUrl: getEnv('CDN_URL') ?? "https://cdn.chatenium.hu",
|
||||
wsUrl: getEnv('WS_URL') ?? "wss://api.chatenium.hu",
|
||||
};
|
||||
apiUrl: "https://api.chatenium.hu",
|
||||
cdnUrl: "https://cdn.chatenium.hu",
|
||||
}
|
||||
|
||||
let currentConfig: SDKConfig = { ...DefaultEnvironment };
|
||||
let currentConfig = {...DefaultEnvironment}
|
||||
|
||||
export const environment = {
|
||||
get(): SDKConfig {
|
||||
return { ...currentConfig };
|
||||
},
|
||||
overwrite(newConfig: Partial<SDKConfig>): void {
|
||||
get: () => currentConfig,
|
||||
overwrite: (newConfig: Partial<SDKConfig>) => {
|
||||
currentConfig = {
|
||||
...currentConfig,
|
||||
...newConfig,
|
||||
};
|
||||
},
|
||||
reset(): void {
|
||||
currentConfig = { ...DefaultEnvironment };
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -1,87 +0,0 @@
|
||||
import {
|
||||
WSListenerPipe,
|
||||
WSConnIdPayload,
|
||||
WSMakeTokenReq,
|
||||
WSMakeTokenResp,
|
||||
WSMessagePayload
|
||||
} from "../domain/websocket.schema";
|
||||
import {getClient} from "./http";
|
||||
import {CreateNetworkReq, Network} from "../domain/networkService.schema";
|
||||
import {isAxiosError} from "axios";
|
||||
import {GenericErrorBody} from "../domain/http.schema";
|
||||
import {environment} from "./environment";
|
||||
|
||||
export class WebSocketHandler {
|
||||
private static instance: WebSocketHandler;
|
||||
private listeners: Set<WSListenerPipe> = new Set();
|
||||
private connection: WebSocket | null = null;
|
||||
private connectionId: string | null = null;
|
||||
|
||||
public static getInstance(): WebSocketHandler {
|
||||
if (!WebSocketHandler.instance) {
|
||||
WebSocketHandler.instance = new WebSocketHandler();
|
||||
}
|
||||
return WebSocketHandler.instance;
|
||||
}
|
||||
|
||||
/**
|
||||
* Connects to Chatenium WS. The ConnectionId is applied automatically in every service. The onMessage pipe is accessible in every service where needed
|
||||
* @param userid
|
||||
* @param token Session token
|
||||
*/
|
||||
public async connect(userid: string, token: string): Promise<void> {
|
||||
const client = getClient(false).create({
|
||||
headers: {
|
||||
"Authorization": token
|
||||
}
|
||||
})
|
||||
|
||||
try {
|
||||
const resp = await client.post<WSMakeTokenResp>("v2/ws/makeToken", <WSMakeTokenReq>{
|
||||
userid: userid,
|
||||
});
|
||||
this.connection = new WebSocket(`${environment.get().wsUrl}/v2/ws?userid=${userid}&access_token=${resp.data.token}`)
|
||||
console.log("Connected to websocket successfully")
|
||||
this.startListening()
|
||||
return
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
public get connId(): string | null {
|
||||
return this.connectionId;
|
||||
}
|
||||
|
||||
private startListening() {
|
||||
if (this.connection) {
|
||||
this.connection.onmessage = (event) => {
|
||||
const payl: WSMessagePayload = JSON.parse(event.data);
|
||||
if (payl.action == "connectionId") {
|
||||
console.log("ConnectionID received")
|
||||
const data: WSConnIdPayload = JSON.parse(payl.data);
|
||||
this.listeners.forEach(listener => {
|
||||
listener.onNewConnId(data.connId)
|
||||
this.connectionId = data.connId;
|
||||
})
|
||||
} else {
|
||||
this.listeners.forEach(listener => {
|
||||
listener.onNewMessage(payl.action, payl.data)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public registerService(service: WSListenerPipe) {
|
||||
this.listeners.add(service);
|
||||
}
|
||||
|
||||
public unregisterService(service: WSListenerPipe) {
|
||||
this.listeners.delete(service);
|
||||
}
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
export interface CreateServerReq {
|
||||
type: "rtmp",
|
||||
channelId: string
|
||||
categoryId: string
|
||||
networkId: string
|
||||
}
|
||||
|
||||
export interface GetRTMPDataReq {
|
||||
channelId: string
|
||||
networkId: string
|
||||
categoryId: string
|
||||
}
|
||||
|
||||
export interface JoinWebsocketRoomReq {
|
||||
userid: string
|
||||
connId: string
|
||||
channelId: string
|
||||
networkId: string
|
||||
categoryId: string
|
||||
}
|
||||
|
||||
export interface StreamRegistry {
|
||||
streamKey: string
|
||||
status: "idling" | "broadcasting" | "broadcasting_starting"
|
||||
type: "rtmp"
|
||||
streamURL: string
|
||||
channelId: string
|
||||
}
|
||||
@@ -1,43 +0,0 @@
|
||||
// Request schemas
|
||||
export interface GetChatsReq {
|
||||
userid: string
|
||||
}
|
||||
|
||||
export interface StartNewReq {
|
||||
userid: string
|
||||
peerUsername: string
|
||||
}
|
||||
|
||||
export interface ToggleChatMuteReq {
|
||||
userid: string
|
||||
chatid: string
|
||||
}
|
||||
|
||||
export interface GetAvailabilityReq {
|
||||
targetId: string
|
||||
connId: string
|
||||
}
|
||||
|
||||
export interface GetAvailabilityResp {
|
||||
available: boolean
|
||||
}
|
||||
|
||||
// Types
|
||||
export interface Chat {
|
||||
userid: string
|
||||
chatid: string
|
||||
username: string
|
||||
displayName: string
|
||||
pfp: string
|
||||
status: 0 | 1
|
||||
type: "outgoing" | "incoming"
|
||||
notifications: number
|
||||
muted: boolean
|
||||
latestMessage: LatestMessage
|
||||
}
|
||||
|
||||
export interface LatestMessage {
|
||||
message: string
|
||||
isAuthor: boolean
|
||||
msgid: string
|
||||
}
|
||||
@@ -14,14 +14,4 @@ export interface PublicUserData {
|
||||
displayName: string
|
||||
username: string
|
||||
userid: string
|
||||
}
|
||||
|
||||
export interface Attachment {
|
||||
fileId: string
|
||||
fileName: string
|
||||
format: string
|
||||
type: string
|
||||
path: string
|
||||
height: number
|
||||
width: number
|
||||
}
|
||||
@@ -1,112 +0,0 @@
|
||||
import {Attachment, TimeStamp} from "./common.schema";
|
||||
|
||||
export interface GetMessageReq {
|
||||
from: number
|
||||
chatid: string
|
||||
}
|
||||
|
||||
export interface GetMessagePosReq {
|
||||
messageId: string
|
||||
chatid: string
|
||||
}
|
||||
|
||||
export interface GetPinnedMessagesReq {
|
||||
chatid: string
|
||||
}
|
||||
|
||||
export interface EditMessageReq {
|
||||
message: string
|
||||
messageId: string
|
||||
chatid: string
|
||||
userid: string
|
||||
}
|
||||
|
||||
export interface FinishMessageReq {
|
||||
uploadId: string | null
|
||||
message: string
|
||||
replyTo: string
|
||||
replyToMessage: string
|
||||
chatid: string
|
||||
userid: string
|
||||
}
|
||||
|
||||
export interface ReadMessagesReq {
|
||||
chatid: string
|
||||
userid: string
|
||||
}
|
||||
|
||||
export interface PinMessageReq {
|
||||
chatid: string
|
||||
messageId: string
|
||||
userid: string
|
||||
message: string
|
||||
}
|
||||
|
||||
export interface UnpinMessageReq {
|
||||
chatid: string,
|
||||
messageId: string,
|
||||
userid: string
|
||||
}
|
||||
|
||||
export interface DeleteMessagesReq {
|
||||
messageIds: string[]
|
||||
chatid: string
|
||||
userid: string
|
||||
}
|
||||
|
||||
export interface JoinWsRoomReq {
|
||||
connId: string
|
||||
chatid: string
|
||||
userid: string
|
||||
}
|
||||
|
||||
// Response schemas
|
||||
export interface GetMessagePosResp {
|
||||
messagePos: number
|
||||
}
|
||||
|
||||
// Types
|
||||
export interface Message {
|
||||
msgid: string
|
||||
author: string
|
||||
message: string
|
||||
sent_at: TimeStamp
|
||||
isEdited: boolean
|
||||
chatid: string
|
||||
files: Attachment[]
|
||||
seen: boolean
|
||||
replyTo: string
|
||||
replyToId: string
|
||||
forwardedFrom: string
|
||||
forwardedFromName: string
|
||||
}
|
||||
|
||||
export interface PinnedMessage {
|
||||
message: string
|
||||
messageId: string
|
||||
}
|
||||
|
||||
// WebSocket payloads
|
||||
export interface WSMessageDeletedPayload {
|
||||
messageId: string
|
||||
}
|
||||
|
||||
export interface WSMessageEditedPayload {
|
||||
messageId: string
|
||||
message: string
|
||||
}
|
||||
|
||||
export interface WSMessagePinnedPayload {
|
||||
chatid: string
|
||||
messageId: string
|
||||
message: string
|
||||
}
|
||||
|
||||
export interface WSMessagesReadPayload {
|
||||
userid: string
|
||||
}
|
||||
|
||||
export interface WSMessageUnpinnedPayload {
|
||||
chatid: string
|
||||
messageId: string
|
||||
}
|
||||
@@ -1,95 +0,0 @@
|
||||
export interface StartNewFileTransferReq {
|
||||
userid: string
|
||||
targetUserId: string
|
||||
metadata: TransferableFileMetadata[]
|
||||
}
|
||||
|
||||
export interface AcceptFileTransferReq {
|
||||
userid: string
|
||||
senderId: string
|
||||
transferId: string
|
||||
}
|
||||
|
||||
export interface DeclineFileTransferReq {
|
||||
userid: string
|
||||
senderId: string
|
||||
transferId: string
|
||||
}
|
||||
|
||||
export interface FileTransferSendOfferRTCReq {
|
||||
userid: string
|
||||
peerId: string
|
||||
transferId: string
|
||||
offer: string
|
||||
}
|
||||
|
||||
export interface FileTransferSendAnswerRTCReq {
|
||||
userid: string
|
||||
peerId: string
|
||||
transferId: string
|
||||
answer: string
|
||||
}
|
||||
|
||||
export interface FileTransferSendICERTCReq {
|
||||
userid: string
|
||||
peerId: string
|
||||
transferId: string
|
||||
candidate: string
|
||||
}
|
||||
|
||||
// Response schemas
|
||||
export interface StartNewFileTransferResp {
|
||||
transferId: string
|
||||
}
|
||||
|
||||
// WebSocket payloads
|
||||
export interface WSNewFileTransferPayload {
|
||||
from: string
|
||||
transferId: string
|
||||
metadata: TransferableFileMetadata[]
|
||||
}
|
||||
|
||||
export interface WSFileTransferAcceptedPayload {
|
||||
transferId: string
|
||||
rtcConfig: RTCConfiguration
|
||||
}
|
||||
|
||||
export interface WSFileTransferDeclinedPayload {
|
||||
transferId: string
|
||||
}
|
||||
|
||||
export interface WSFileTransferRTCOfferPayload {
|
||||
transferId: string
|
||||
offer: string
|
||||
}
|
||||
|
||||
export interface WSFileTransferRTCAnswerPayload {
|
||||
transferId: string
|
||||
answer: string
|
||||
}
|
||||
|
||||
export interface WSFileTransferRTCIcePayload {
|
||||
transferId: string
|
||||
candidate: string
|
||||
}
|
||||
|
||||
// DataChannel payloads
|
||||
export interface DCStartNewFilePayload {
|
||||
fileId: string
|
||||
fileIndex: number
|
||||
fileName: string
|
||||
totalChunks: number
|
||||
}
|
||||
|
||||
export interface DCTransferFilePayload {
|
||||
fileId: string
|
||||
fileIndex: string
|
||||
chunk: string
|
||||
}
|
||||
|
||||
// Types
|
||||
export interface TransferableFileMetadata {
|
||||
fileId: string
|
||||
name: string
|
||||
size: number
|
||||
}
|
||||
@@ -1,45 +0,0 @@
|
||||
// Request schemas
|
||||
export interface RegisterUploadReq {
|
||||
roomId: string
|
||||
userid: string
|
||||
files: FileUploadRegistration[]
|
||||
}
|
||||
|
||||
export interface ChunkUploadReq {
|
||||
uploadId: string
|
||||
fileId: string
|
||||
chunk: string
|
||||
roomId: string
|
||||
userid: string
|
||||
}
|
||||
|
||||
export interface FinishUploadReq {
|
||||
uploadId: string
|
||||
roomId: string
|
||||
userid: string
|
||||
}
|
||||
|
||||
// Response schemas
|
||||
export interface RegisterUploadResp {
|
||||
uploadId: string
|
||||
}
|
||||
|
||||
// Types
|
||||
export interface FileUploadRegistration {
|
||||
size: number
|
||||
type: string
|
||||
name: string
|
||||
fileId: string
|
||||
}
|
||||
|
||||
export interface FileData {
|
||||
fileId: string
|
||||
name: string
|
||||
extension: string
|
||||
type: string
|
||||
data: File
|
||||
}
|
||||
|
||||
export interface FileUploadProgressListener {
|
||||
fileProgressUpdate: (fileId: string, allChunks: number, chunksDone: number) => void
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
import {PublicUserData} from "./common.schema";
|
||||
import {GIF, PersonalUserData} from "./userService.schema";
|
||||
|
||||
export interface Session {
|
||||
userData: PersonalUserData
|
||||
token: string
|
||||
}
|
||||
|
||||
export interface ValidateSessionReq {
|
||||
token: string
|
||||
}
|
||||
|
||||
export interface ValidateSessionResp {
|
||||
validationOk: boolean
|
||||
}
|
||||
|
||||
export interface UpdateUserDataReq {
|
||||
userid: string
|
||||
}
|
||||
@@ -1,138 +0,0 @@
|
||||
import {Attachment, PublicUserData, TimeStamp} from "./common.schema";
|
||||
|
||||
export interface GetMessageReq {
|
||||
from: number
|
||||
channelId: string
|
||||
networkId: string
|
||||
categoryId: string
|
||||
}
|
||||
|
||||
export interface GetMessagePosReq {
|
||||
messageId: string
|
||||
channelId: string
|
||||
networkId: string
|
||||
categoryId: string
|
||||
}
|
||||
|
||||
export interface GetPinnedMessagesReq {
|
||||
channelId: string
|
||||
networkId: string
|
||||
categoryId: string
|
||||
}
|
||||
|
||||
export interface EditMessageReq {
|
||||
message: string
|
||||
messageId: string
|
||||
channelId: string
|
||||
networkId: string
|
||||
categoryId: string
|
||||
userid: string
|
||||
}
|
||||
|
||||
export interface FinishMessageReq {
|
||||
uploadId: string | null
|
||||
message: string
|
||||
replyTo: string
|
||||
replyToMessage: string
|
||||
channelId: string
|
||||
networkId: string
|
||||
categoryId: string
|
||||
userid: string
|
||||
}
|
||||
|
||||
export interface ReadMessagesReq {
|
||||
channelId: string
|
||||
networkId: string
|
||||
categoryId: string
|
||||
userid: string
|
||||
}
|
||||
|
||||
export interface PinMessageReq {
|
||||
channelId: string
|
||||
networkId: string
|
||||
categoryId: string
|
||||
messageId: string
|
||||
userid: string
|
||||
message: string
|
||||
}
|
||||
|
||||
export interface UnpinMessageReq {
|
||||
channelId: string
|
||||
networkId: string
|
||||
categoryId: string,
|
||||
messageId: string,
|
||||
userid: string
|
||||
}
|
||||
|
||||
export interface DeleteMessagesReq {
|
||||
messageIds: string[]
|
||||
channelId: string
|
||||
networkId: string
|
||||
categoryId: string
|
||||
userid: string
|
||||
}
|
||||
|
||||
export interface JoinWsRoomReq {
|
||||
connId: string
|
||||
channelId: string
|
||||
networkId: string
|
||||
categoryId: string
|
||||
userid: string
|
||||
}
|
||||
|
||||
// Response schemas
|
||||
export interface GetMessagePosResp {
|
||||
messagePos: number
|
||||
}
|
||||
|
||||
// Types
|
||||
export interface Message {
|
||||
msgid: string
|
||||
author: PublicUserData
|
||||
message: string
|
||||
sent_at: TimeStamp
|
||||
isEdited: boolean
|
||||
channelId: string
|
||||
networkId: string
|
||||
categoryId: string
|
||||
files: Attachment[]
|
||||
seen: boolean
|
||||
replyTo: string
|
||||
replyToId: string
|
||||
forwardedFrom: string
|
||||
forwardedFromName: string
|
||||
}
|
||||
|
||||
export interface PinnedMessage {
|
||||
message: string
|
||||
messageId: string
|
||||
}
|
||||
|
||||
// WebSocket payloads
|
||||
export interface WSMessageDeletedPayload {
|
||||
messageId: string
|
||||
}
|
||||
|
||||
export interface WSMessageEditedPayload {
|
||||
messageId: string
|
||||
message: string
|
||||
}
|
||||
|
||||
export interface WSMessagePinnedPayload {
|
||||
channelId: string
|
||||
networkId: string
|
||||
categoryId: string
|
||||
messageId: string
|
||||
message: string
|
||||
}
|
||||
|
||||
export interface WSMessagesReadPayload {
|
||||
userid: string
|
||||
}
|
||||
|
||||
export interface WSMessageUnpinnedPayload {
|
||||
channelId: string
|
||||
networkId: string
|
||||
categoryId: string
|
||||
messageId: string
|
||||
}
|
||||
@@ -1,114 +0,0 @@
|
||||
import {TimeStamp} from "./common.schema";
|
||||
|
||||
export interface ChangeUsernameReq {
|
||||
newUsername: string;
|
||||
userid: string;
|
||||
}
|
||||
|
||||
export interface ChangeDisplayNameReq {
|
||||
newDisplayName: string;
|
||||
userid: string;
|
||||
}
|
||||
|
||||
export interface ChangePasswordReq {
|
||||
newPassword: string;
|
||||
currentPassword: string;
|
||||
userid: string;
|
||||
}
|
||||
|
||||
export interface ChangeEmailReq {
|
||||
currentPassword: string;
|
||||
newMail: string;
|
||||
userid: string;
|
||||
}
|
||||
|
||||
export interface VerifyMailChangeReq {
|
||||
userid: string;
|
||||
vCodeCurrent: number;
|
||||
vCodeNew: number;
|
||||
newAddress: string;
|
||||
}
|
||||
|
||||
export interface ChangePhoneReq {
|
||||
currentPassword: string;
|
||||
newPhone: string;
|
||||
userid: string;
|
||||
}
|
||||
|
||||
export interface VerifyPhoneChange {
|
||||
userid: string;
|
||||
vCodeCurrent: number;
|
||||
vCodeNew: number;
|
||||
newPhone: string;
|
||||
}
|
||||
|
||||
export interface UploadNewPfpReq {
|
||||
userid: string;
|
||||
pfpId: string;
|
||||
}
|
||||
|
||||
export interface UploadNewPfpCdnReq {
|
||||
userid: string;
|
||||
data: string | null;
|
||||
isImage: boolean;
|
||||
monogramLetter: string | null;
|
||||
monogramColors: string | null;
|
||||
}
|
||||
|
||||
export interface DeleteReq {
|
||||
userid: string;
|
||||
password: string;
|
||||
}
|
||||
|
||||
export interface RegisterFCMTokenReq {
|
||||
userid: string;
|
||||
token: string;
|
||||
language: string;
|
||||
}
|
||||
|
||||
export interface GetSessionsReq {
|
||||
userid: string;
|
||||
}
|
||||
|
||||
export interface UpdateUserDataReq {
|
||||
userid: string;
|
||||
}
|
||||
|
||||
export interface ToggleGifSaveReq {
|
||||
userid: string;
|
||||
url: string;
|
||||
}
|
||||
|
||||
export interface UploadNewPfpCdnResp {
|
||||
pfpId: string;
|
||||
}
|
||||
|
||||
export interface Session {
|
||||
token: string;
|
||||
os: string;
|
||||
language: string;
|
||||
login_at: TimeStamp | string;
|
||||
}
|
||||
|
||||
export interface GIF {
|
||||
gifId: string;
|
||||
url: string;
|
||||
path: string;
|
||||
}
|
||||
|
||||
export interface CurrNewCodeTestingResp {
|
||||
codeCurr: number|null;
|
||||
codeNew: number|null;
|
||||
}
|
||||
|
||||
export interface PersonalUserData {
|
||||
userid: string;
|
||||
username: string;
|
||||
displayName: string;
|
||||
pfp: string;
|
||||
pictureDiscovery: boolean;
|
||||
gifs: GIF[];
|
||||
passwordSet: boolean;
|
||||
emailSet: boolean;
|
||||
phoneSet: boolean;
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
export interface WSListenerPipe {
|
||||
identifier: string; // Any identifier that is unique to the service (chatid, networkId, etc...)
|
||||
onNewConnId: (newConnId: string) => void;
|
||||
onNewMessage: MessageListener;
|
||||
}
|
||||
|
||||
export type MessageListener = (action: string, data: string) => void
|
||||
|
||||
export interface WSMakeTokenReq {
|
||||
userid: string
|
||||
}
|
||||
|
||||
export interface WSMakeTokenResp {
|
||||
token: string
|
||||
}
|
||||
|
||||
export interface WSConnIdPayload {
|
||||
connId: string
|
||||
}
|
||||
|
||||
export interface WSConnIdPayload {
|
||||
connId: string
|
||||
}
|
||||
|
||||
export interface WSMessagePayload {
|
||||
action: string,
|
||||
data: string
|
||||
}
|
||||
13
src/index.test.ts
Normal file
13
src/index.test.ts
Normal file
@@ -0,0 +1,13 @@
|
||||
import {beforeAll, describe, expect, it} from "vitest";
|
||||
import {jezus} from "./index";
|
||||
import {KeyringAPI} from "./storage/keyring";
|
||||
import {KeyringMock} from "./mocks/storage/keyring";
|
||||
|
||||
describe("Testing", () => {
|
||||
it("should be defined", () => {
|
||||
let keyringMock = new KeyringMock();
|
||||
jezus(keyringMock)
|
||||
|
||||
expect(keyringMock.get("keyring")).toBe("apad");
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,5 @@
|
||||
import {KeyringAPI} from "./storage/keyring";
|
||||
|
||||
export function jezus(keyring: KeyringAPI) {
|
||||
keyring.set("keyring", "apad");
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
import {http, HttpResponse} from "msw";
|
||||
import {GetRTCAccessResp} from "../../domain/callService.schema";
|
||||
import {StreamRegistry} from "../../domain/broadcastChannelService.schema";
|
||||
|
||||
export const brcChanHandlers = [
|
||||
http.get('*/network/channel/rtmpData', () => {
|
||||
return HttpResponse.json(<StreamRegistry>{
|
||||
status: "broadcasting_starting"
|
||||
})
|
||||
}),
|
||||
]
|
||||
@@ -1,23 +0,0 @@
|
||||
import {http, HttpResponse} from "msw";
|
||||
import {Chat, GetAvailabilityResp, StartNewReq} from "../../domain/chatService.schema";
|
||||
|
||||
export const chatHandlers = [
|
||||
http.get('*/chat/get', () => {
|
||||
return HttpResponse.json(<Chat[]>[{
|
||||
userid: "chatPartnerId"
|
||||
}])
|
||||
}),
|
||||
|
||||
http.get('*/chat/availability', () => {
|
||||
return HttpResponse.json(<GetAvailabilityResp>{
|
||||
available: true
|
||||
})
|
||||
}),
|
||||
|
||||
http.post('*/chat/startNew', async ({request}) => {
|
||||
const body = await request.json() as StartNewReq
|
||||
return HttpResponse.json(<Chat>{
|
||||
username: body.peerUsername
|
||||
})
|
||||
}),
|
||||
]
|
||||
@@ -1,31 +0,0 @@
|
||||
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";
|
||||
|
||||
export const dmHandlers = [
|
||||
http.get('*/chat/dm/messages', () => {
|
||||
return HttpResponse.json(<Message[]>[{
|
||||
message: "This is a message",
|
||||
}])
|
||||
}),
|
||||
|
||||
http.get('*/chat/dm/getMessagePosition', () => {
|
||||
return HttpResponse.json(<GetMessagePosResp>{
|
||||
messagePos: 5000
|
||||
})
|
||||
}),
|
||||
|
||||
http.get('*/chat/dm/pinnedMessages', () => {
|
||||
return HttpResponse.json(<PinnedMessage[]>[{
|
||||
message: "This is a pinned message",
|
||||
}])
|
||||
}),
|
||||
|
||||
http.post('*/chat/dm/finishMessage', async ({request}) => {
|
||||
const body = await request.json() as FinishMessageReq
|
||||
return HttpResponse.json(<Message>{
|
||||
message: body.message,
|
||||
})
|
||||
}),
|
||||
]
|
||||
@@ -1,19 +0,0 @@
|
||||
import {http, HttpResponse} from "msw";
|
||||
import {GetRTCAccessResp} from "../../domain/callService.schema";
|
||||
import {RegisterUploadResp} from "../../domain/fileUploadService.schema";
|
||||
|
||||
export const fileUploadHandlers = [
|
||||
http.post('*/chat/cdnRegisterUpload', () => {
|
||||
return HttpResponse.json(<RegisterUploadResp>{
|
||||
uploadId: "MockUploadId"
|
||||
})
|
||||
}),
|
||||
|
||||
http.post('*/chat/uploadChunk', () => {
|
||||
return HttpResponse.json()
|
||||
}),
|
||||
|
||||
http.post('*/chat/finishUpload', () => {
|
||||
return HttpResponse.json()
|
||||
}),
|
||||
]
|
||||
@@ -1,11 +0,0 @@
|
||||
import {http, HttpResponse} from "msw";
|
||||
import {GetResp} from "../../domain/pictureService.schema";
|
||||
import {Session} from "../../domain/userService.schema";
|
||||
|
||||
export const userHandler = [
|
||||
http.post('*/user/getSessions', () => {
|
||||
return HttpResponse.json(<Session[]>[{
|
||||
token: "sessionToken"
|
||||
}])
|
||||
}),
|
||||
]
|
||||
@@ -2,20 +2,10 @@ 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";
|
||||
|
||||
export const allHandlers = [
|
||||
...authHandlers,
|
||||
...networkHandlers,
|
||||
...pictureHandlers,
|
||||
...callHandlers,
|
||||
...fileUploadHandlers,
|
||||
...chatHandlers,
|
||||
...dmHandlers,
|
||||
...userHandler,
|
||||
...brcChanHandlers
|
||||
...callHandlers
|
||||
]
|
||||
@@ -4,9 +4,6 @@ export class DatabaseMock implements DatabaseAPI {
|
||||
database: { [collection: string]: { [key: string]: string } } = {};
|
||||
|
||||
set(collection: string, key: string, value: any) {
|
||||
if (!this.database[collection]) {
|
||||
this.database[collection] = {};
|
||||
}
|
||||
this.database[collection][key] = JSON.stringify(value);
|
||||
}
|
||||
|
||||
|
||||
@@ -11,11 +11,11 @@ export class KeyringMock implements KeyringAPI {
|
||||
return this.ring[key];
|
||||
}
|
||||
|
||||
getAll(): string[] {
|
||||
return Object.keys(this.ring);
|
||||
}
|
||||
|
||||
delete(key: string) {
|
||||
delete this.ring[key];
|
||||
}
|
||||
|
||||
flush() {
|
||||
this.ring = {};
|
||||
}
|
||||
}
|
||||
@@ -164,6 +164,7 @@ export class AuthService {
|
||||
});
|
||||
return resp.data.authCode
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
import {describe, expect, it} from "vitest";
|
||||
import {BroadcastChannelService} from "./broadcastChannelService";
|
||||
|
||||
describe("BroadcastChannelService", () => {
|
||||
const service = new BroadcastChannelService("", "", "", "", "", () => {})
|
||||
|
||||
it("should get stream registry data", async () => {
|
||||
const data = await service.getData()
|
||||
expect(data.status).toBe("broadcasting_starting")
|
||||
})
|
||||
})
|
||||
@@ -1,93 +0,0 @@
|
||||
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 {
|
||||
CreateServerReq,
|
||||
GetRTMPDataReq,
|
||||
JoinWebsocketRoomReq,
|
||||
StreamRegistry
|
||||
} from "../domain/broadcastChannelService.schema";
|
||||
|
||||
export class BroadcastChannelService {
|
||||
userid: string
|
||||
channelId: string
|
||||
networkId: string
|
||||
categoryId: string
|
||||
client: AxiosInstance;
|
||||
|
||||
constructor(token: string, userid: string, networkId: string, categoryId: string, channelId: string, wsMessageListener: MessageListener) {
|
||||
this.userid = userid;
|
||||
this.channelId = channelId;
|
||||
this.categoryId = categoryId;
|
||||
this.networkId = networkId;
|
||||
this.client = getClient(false).create({
|
||||
headers: {
|
||||
"Authorization": token,
|
||||
"X-WS-ID": WebSocketHandler.getInstance().connId
|
||||
}
|
||||
})
|
||||
WebSocketHandler.getInstance().registerService({
|
||||
identifier: channelId,
|
||||
onNewConnId: this.onNewConnId,
|
||||
onNewMessage: wsMessageListener,
|
||||
})
|
||||
}
|
||||
|
||||
private onNewConnId(newConnId: string) {
|
||||
console.log("NetworkService: New connection id")
|
||||
this.client.defaults.headers["X-WS-ID"] = newConnId;
|
||||
}
|
||||
|
||||
async getData(): Promise<StreamRegistry> {
|
||||
try {
|
||||
const resp = await this.client.get<StreamRegistry>(`network/channel/rtmpData?userid=${this.userid}&channelId=${this.channelId}&networkId=${this.networkId}&categoryId=${this.categoryId}`);
|
||||
return resp.data
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
async createServer(): Promise<StreamRegistry> {
|
||||
try {
|
||||
const resp = await this.client.post<StreamRegistry>("network/channel/createServer", <CreateServerReq>{
|
||||
userid: this.userid,
|
||||
channelId: this.channelId,
|
||||
networkId: this.networkId,
|
||||
type: "rtmp",
|
||||
categoryId: this.categoryId,
|
||||
});
|
||||
return resp.data
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
async joinWebSocketRoom(): Promise<void> {
|
||||
try {
|
||||
await this.client.post("v2/network/channel/joinWebSocketRoom", <JoinWebsocketRoomReq>{
|
||||
userid: this.userid,
|
||||
channelId: this.channelId,
|
||||
networkId: this.networkId,
|
||||
connId: WebSocketHandler.getInstance().connId,
|
||||
categoryId: this.categoryId,
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
import {describe, expect, it} from "vitest";
|
||||
import {ChatService} from "./chatService";
|
||||
import {DatabaseMock} from "../mocks/storage/database";
|
||||
import {faker} from "@faker-js/faker/locale/en";
|
||||
|
||||
describe("ChatService", () => {
|
||||
const service = new ChatService("", "", new DatabaseMock(), (action, data) => {})
|
||||
|
||||
it('should get chats', async () => {
|
||||
const chats = await service.get()
|
||||
expect(chats[0].userid).toBe("chatPartnerId")
|
||||
})
|
||||
|
||||
it('should get availability', async () => {
|
||||
const available = await service.getUserAvailability("")
|
||||
expect(available).toBeTruthy()
|
||||
});
|
||||
|
||||
it('should create a new chat', async () => {
|
||||
const chatPartnerName = faker.internet.displayName()
|
||||
const newChat = await service.startNew(chatPartnerName)
|
||||
expect(newChat.username).toBe(chatPartnerName)
|
||||
});
|
||||
})
|
||||
@@ -1,126 +0,0 @@
|
||||
import {DatabaseAPI} from "../storage/database";
|
||||
import {MessageListener} from "../domain/websocket.schema";
|
||||
import {getClient} from "../core/http";
|
||||
import {WebSocketHandler} from "../core/webSocketHandler";
|
||||
import {AxiosInstance, isAxiosError} from "axios";
|
||||
import {NetworkInvite} from "../domain/networkService.schema";
|
||||
import {GenericErrorBody} from "../domain/http.schema";
|
||||
import {
|
||||
Chat,
|
||||
GetAvailabilityReq,
|
||||
GetAvailabilityResp,
|
||||
StartNewReq,
|
||||
ToggleChatMuteReq
|
||||
} from "../domain/chatService.schema";
|
||||
import {Message} from "../domain/dmService.schema";
|
||||
|
||||
/**
|
||||
* ChatService is an exception because it's one instance for all chats because it's unnecessary to create a new instance for each chat
|
||||
*/
|
||||
export class ChatService {
|
||||
userid: string;
|
||||
database: DatabaseAPI;
|
||||
client: AxiosInstance;
|
||||
|
||||
constructor(userid: string, token: string, database: DatabaseAPI, wsMessageListener: MessageListener) {
|
||||
this.userid = userid;
|
||||
this.database = database;
|
||||
this.client = getClient(false).create({
|
||||
headers: {
|
||||
"Authorization": token,
|
||||
}
|
||||
})
|
||||
WebSocketHandler.getInstance().registerService({
|
||||
identifier: userid,
|
||||
onNewConnId: this.onNewConnId,
|
||||
onNewMessage: wsMessageListener,
|
||||
})
|
||||
}
|
||||
|
||||
private onNewConnId(newConnId: string) {
|
||||
console.log("ChatService: New connection id")
|
||||
this.client.defaults.headers["X-WS-ID"] = newConnId;
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetches all chat partners
|
||||
*/
|
||||
async get(): Promise<Chat[]> {
|
||||
try {
|
||||
const resp = await this.client.get<Chat[]>(`chat/get?userid=${this.userid}`);
|
||||
this.database.set("chats", this.userid, JSON.stringify(resp.data))
|
||||
return resp.data
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
getQuick(): Message[] {
|
||||
const chats = this.database.get("chats", this.userid)
|
||||
if (chats) {
|
||||
return JSON.parse(chats)
|
||||
} else {
|
||||
throw new Error("No chats in database")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the availability of the specified user
|
||||
* @param userid
|
||||
*/
|
||||
async getUserAvailability(userid: string): Promise<boolean> {
|
||||
try {
|
||||
const resp = await this.client.get<GetAvailabilityResp>(`chat/availability?target=${this.userid}&connId=${WebSocketHandler.getInstance().connId}`);
|
||||
return resp.data.available
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* (un)mutes the specified chat
|
||||
* @param chatid
|
||||
*/
|
||||
async toggleMute(chatid: string): Promise<void> {
|
||||
try {
|
||||
const resp = await this.client.post("v2/chat/toggleMute", <ToggleChatMuteReq>{
|
||||
userid: this.userid,
|
||||
chatid: chatid,
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts a new chat with the specified user
|
||||
* @param peerUsername
|
||||
*/
|
||||
async startNew(peerUsername: string): Promise<Chat> {
|
||||
try {
|
||||
const resp = await this.client.post("chat/startNew", <StartNewReq>{
|
||||
userid: this.userid,
|
||||
peerUsername: peerUsername,
|
||||
});
|
||||
return resp.data
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
import {describe, expect, it} from "vitest";
|
||||
import {DMService} from "./dmService";
|
||||
import {DatabaseMock} from "../mocks/storage/database";
|
||||
import {faker} from "@faker-js/faker/locale/en";
|
||||
|
||||
describe("DmService", () => {
|
||||
const service = new DMService("", "", "", new DatabaseMock(), () => {})
|
||||
|
||||
it("should get messages", async () => {
|
||||
const messages = await service.get()
|
||||
expect(messages[0].message).toBe("This is a message")
|
||||
})
|
||||
|
||||
it('should get message position', async () => {
|
||||
const pos = await service.getMessagePos("")
|
||||
expect(pos).toBe(5000)
|
||||
});
|
||||
|
||||
it('should get pinned messages', async () => {
|
||||
const pinnedMessages = await service.getPinnedMessages()
|
||||
expect(pinnedMessages[0].message).toBe("This is a pinned message")
|
||||
});
|
||||
|
||||
it('should send a new message', async () => {
|
||||
const message = faker.internet.displayName()
|
||||
const newMessage = await service.sendMessage(message)
|
||||
expect(newMessage.message).toBe(message)
|
||||
});
|
||||
})
|
||||
@@ -1,260 +0,0 @@
|
||||
import {DatabaseAPI} from "../storage/database";
|
||||
import {AxiosInstance, isAxiosError} from "axios";
|
||||
import {MessageListener} from "../domain/websocket.schema";
|
||||
import {getClient} from "../core/http";
|
||||
import {WebSocketHandler} from "../core/webSocketHandler";
|
||||
import {
|
||||
DeleteMessagesReq,
|
||||
EditMessageReq,
|
||||
FinishMessageReq,
|
||||
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";
|
||||
|
||||
export class DMService {
|
||||
userid: string;
|
||||
chatid: string;
|
||||
token: string;
|
||||
database: DatabaseAPI;
|
||||
client: AxiosInstance
|
||||
|
||||
constructor(userid: string, token: string, chatid: string, database: DatabaseAPI, wsMessageListener: MessageListener) {
|
||||
this.userid = userid;
|
||||
this.chatid = chatid;
|
||||
this.database = database;
|
||||
this.token = token;
|
||||
this.client = getClient(false).create({
|
||||
headers: {
|
||||
"Authorization": token,
|
||||
"X-WS-ID": WebSocketHandler.getInstance().connId
|
||||
}
|
||||
})
|
||||
WebSocketHandler.getInstance().registerService({
|
||||
identifier: chatid,
|
||||
onNewConnId: this.onNewConnId,
|
||||
onNewMessage: wsMessageListener,
|
||||
})
|
||||
}
|
||||
|
||||
private onNewConnId(newConnId: string) {
|
||||
console.log("NetworkService: New connection id")
|
||||
this.client.defaults.headers["X-WS-ID"] = newConnId;
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetches all messages in the chat
|
||||
* @param from
|
||||
*/
|
||||
async get(from: number = 0): Promise<Message[]> {
|
||||
try {
|
||||
const resp = await this.client.get<Message[]>(`chat/dm/messages?chatid=${this.chatid}&userid=${this.userid}&from=${from}`);
|
||||
if (from == 0) {
|
||||
this.database.set("messages", this.chatid, JSON.stringify(resp.data))
|
||||
}
|
||||
return resp.data
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
getQuick(): Message[] {
|
||||
const messages = this.database.get("messages", this.chatid)
|
||||
if (messages) {
|
||||
return JSON.parse(messages)
|
||||
} else {
|
||||
throw new Error("No messages in database")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetches the position of the specified message which can be used in get() to fetch an old message with it's surrounding messages
|
||||
* @param messageId
|
||||
*/
|
||||
async getMessagePos(messageId: string): Promise<number> {
|
||||
try {
|
||||
const resp = await this.client.get<GetMessagePosResp>(`chat/dm/getMessagePosition?chatid=${this.chatid}&userid=${this.userid}&messageId=${messageId}`);
|
||||
return resp.data.messagePos
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets all messages pinned in the chat
|
||||
*/
|
||||
async getPinnedMessages(): Promise<PinnedMessage[]> {
|
||||
try {
|
||||
const resp = await this.client.get<PinnedMessage[]>(`chat/dm/pinnedMessages?chatid=${this.chatid}&userid=${this.userid}`);
|
||||
return resp.data
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Edits the specified message
|
||||
* @param messageId
|
||||
* @param newMessage
|
||||
*/
|
||||
async editMessage(messageId: string, newMessage: string): Promise<void> {
|
||||
try {
|
||||
const resp = await this.client.patch("chat/dm/editMessage", <EditMessageReq>{
|
||||
messageId: messageId,
|
||||
chatid: this.chatid,
|
||||
userid: this.userid,
|
||||
message: newMessage
|
||||
});
|
||||
return resp.data
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sends a new message to the chat
|
||||
* @param message
|
||||
* @param replyTo
|
||||
* @param replyToMessage
|
||||
* @param attachments
|
||||
* @param progressListener
|
||||
*/
|
||||
async sendMessage(message: string, replyTo: string | null = null, replyToMessage: string | null = null, attachments: FileData[] | null = null, progressListener: FileUploadProgressListener | null = null): Promise<Message> {
|
||||
let uploadId = ""
|
||||
if (attachments) {
|
||||
const uploader = new FileUploadService(this.token)
|
||||
uploadId = await uploader.uploadFiles(this.chatid, this.userid, attachments, progressListener!)
|
||||
}
|
||||
try {
|
||||
const resp = await this.client.post<Message>("chat/dm/finishMessage", <FinishMessageReq>{
|
||||
message: message,
|
||||
chatid: this.chatid,
|
||||
replyTo: replyTo,
|
||||
replyToMessage: replyToMessage,
|
||||
userid: this.userid,
|
||||
uploadId: uploadId,
|
||||
});
|
||||
return resp.data
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Reads all messages sent to you in the chat
|
||||
*/
|
||||
async readMessages(): Promise<void> {
|
||||
try {
|
||||
await this.client.patch("chat/dm/readMessages", <ReadMessagesReq>{
|
||||
chatid: this.chatid,
|
||||
userid: this.userid,
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Pins the specified message
|
||||
* @param messageId
|
||||
* @param message
|
||||
*/
|
||||
async pinMessage(messageId: string, message: string): Promise<void> {
|
||||
try {
|
||||
const resp = await this.client.patch("chat/dm/pinMessage", <PinMessageReq>{
|
||||
messageId: messageId,
|
||||
chatid: this.chatid,
|
||||
userid: this.userid,
|
||||
message: message
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Unpins the specified message
|
||||
* @param messageId
|
||||
*/
|
||||
async unpinMessage(messageId: string): Promise<void> {
|
||||
try {
|
||||
const resp = await this.client.patch("chat/dm/unpinMessage", <UnpinMessageReq>{
|
||||
messageId: messageId,
|
||||
chatid: this.chatid,
|
||||
userid: this.userid,
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes the message(s)
|
||||
* @param messageIds
|
||||
*/
|
||||
async deleteMessages(messageIds: string[]): Promise<void> {
|
||||
try {
|
||||
const resp = await this.client.patch("chat/dm/deleteMessages", <DeleteMessagesReq>{
|
||||
chatid: this.chatid,
|
||||
userid: this.userid,
|
||||
messageIds: messageIds
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Joins the WebSocket room to start receiving realtime messages
|
||||
*/
|
||||
async joinWebSocketRoom(): Promise<void> {
|
||||
try {
|
||||
const resp = await this.client.patch("chat/dm/joinWebSocketRoom", <JoinWsRoomReq>{
|
||||
chatid: this.chatid,
|
||||
userid: this.userid,
|
||||
connId: WebSocketHandler.getInstance().connId,
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,156 +0,0 @@
|
||||
import {DatabaseAPI} from "../storage/database";
|
||||
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 {
|
||||
AcceptFileTransferReq, DeclineFileTransferReq, FileTransferSendAnswerRTCReq,
|
||||
FileTransferSendICERTCReq, FileTransferSendOfferRTCReq,
|
||||
StartNewFileTransferReq,
|
||||
StartNewFileTransferResp,
|
||||
TransferableFileMetadata
|
||||
} from "../domain/fileTransferService.schema";
|
||||
|
||||
export class FileTransferService {
|
||||
userid: string;
|
||||
peerId: string;
|
||||
transferId: string = "";
|
||||
client: AxiosInstance
|
||||
|
||||
constructor(userid: string, token: string, peerId: string) {
|
||||
this.userid = userid;
|
||||
this.peerId = peerId;
|
||||
this.client = getClient(false).create({
|
||||
headers: {
|
||||
"Authorization": token,
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts a new file transfer with the specified user. The new transferId will be saved automatically and not required to be provided later.
|
||||
* @param transferableFiles
|
||||
*/
|
||||
async startNew(transferableFiles: TransferableFileMetadata[]): Promise<string> {
|
||||
try {
|
||||
const resp = await this.client.post<StartNewFileTransferResp>("v2/chat/dm/startNewFileTransfer", <StartNewFileTransferReq>{
|
||||
userid: this.userid,
|
||||
targetUserId: this.peerId,
|
||||
metadata: transferableFiles
|
||||
});
|
||||
this.transferId = resp.data.transferId
|
||||
return resp.data.transferId
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Accepts the file transfer with the specified transferId. The transferId will be saved automatically and not required to be provided later.
|
||||
* @param transferId
|
||||
*/
|
||||
async accept(transferId: string): Promise<RTCConfiguration> {
|
||||
try {
|
||||
const resp = await this.client.post<RTCConfiguration>("v2/chat/dm/acceptFileTransfer", <AcceptFileTransferReq>{
|
||||
userid: this.userid,
|
||||
senderId: this.peerId,
|
||||
transferId: transferId
|
||||
});
|
||||
this.transferId = transferId
|
||||
return resp.data
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Declines the file transfer with the specified transferId.
|
||||
* @param transferId
|
||||
*/
|
||||
async decline(transferId: string): Promise<void> {
|
||||
try {
|
||||
await this.client.post("v2/chat/dm/declineFileTransfer", <DeclineFileTransferReq>{
|
||||
userid: this.userid,
|
||||
senderId: this.peerId,
|
||||
transferId: transferId
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Forwards your RTC offer to the specified user.
|
||||
* @param offer
|
||||
*/
|
||||
async sendRtcOffer(offer: string): Promise<void> {
|
||||
try {
|
||||
await this.client.post("v2/chat/dm/sendRtcOfferFileTransfer", <FileTransferSendOfferRTCReq>{
|
||||
userid: this.userid,
|
||||
peerId: this.peerId,
|
||||
transferId: this.transferId,
|
||||
offer: offer,
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Forwards your RTC answer to the specified user.
|
||||
* @param answer
|
||||
*/
|
||||
async sendRtcAnswer(answer: string): Promise<void> {
|
||||
try {
|
||||
await this.client.post("v2/chat/dm/sendRtcAnswerFileTransfer", <FileTransferSendAnswerRTCReq>{
|
||||
userid: this.userid,
|
||||
peerId: this.peerId,
|
||||
transferId: this.transferId,
|
||||
answer: answer,
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Forwards your RTC ICE candidate to the specified user.
|
||||
* @param candidate
|
||||
*/
|
||||
async sendRtcICE(candidate: string): Promise<void> {
|
||||
try {
|
||||
await this.client.post("v2/chat/dm/sendRtcICEFileTransfer", <FileTransferSendICERTCReq>{
|
||||
userid: this.userid,
|
||||
peerId: this.peerId,
|
||||
transferId: this.transferId,
|
||||
candidate: candidate,
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
import {describe, expect, it} from "vitest";
|
||||
import {FileUploadService} from "./fileUploadService";
|
||||
|
||||
describe("fileUploadService", () => {
|
||||
it('should upload files', async () => {
|
||||
const service = new FileUploadService("");
|
||||
const uploadId = await service.uploadFiles("", "", [], {
|
||||
fileProgressUpdate: () => {}
|
||||
})
|
||||
expect(uploadId).toBe("MockUploadId")
|
||||
});
|
||||
})
|
||||
@@ -1,137 +0,0 @@
|
||||
import {
|
||||
ChunkUploadReq,
|
||||
FileData, FileUploadProgressListener,
|
||||
FileUploadRegistration, FinishUploadReq,
|
||||
RegisterUploadReq,
|
||||
RegisterUploadResp
|
||||
} from "../domain/fileUploadService.schema";
|
||||
import {AxiosInstance, isAxiosError} from "axios";
|
||||
import {getClient} from "../core/http";
|
||||
import {InviteToCallReq} from "../domain/callService.schema";
|
||||
import {GenericErrorBody} from "../domain/http.schema";
|
||||
import {v4 as uuidv4} from 'uuid';
|
||||
|
||||
export class FileUploadService {
|
||||
client: AxiosInstance;
|
||||
cdnClient: AxiosInstance;
|
||||
|
||||
constructor(token: string) {
|
||||
this.client = getClient(false).create({
|
||||
headers: {
|
||||
"Authorization": token
|
||||
}
|
||||
})
|
||||
this.cdnClient = getClient(true).create({
|
||||
headers: {
|
||||
"Authorization": token
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
private MIN_CHUNK_SIZE = 25000000
|
||||
|
||||
private calculateChunkSize(totalSize: number) {
|
||||
let chunks = Math.floor(totalSize / this.MIN_CHUNK_SIZE);
|
||||
if (chunks === 0) return totalSize;
|
||||
const chunkSize = Math.ceil(totalSize / chunks);
|
||||
return Math.max(chunkSize, this.MIN_CHUNK_SIZE);
|
||||
}
|
||||
|
||||
/**
|
||||
* Automatically registers the upload, calculates chunksize and uploads each chunk and returns with an uploadId that must be provided when sending the message
|
||||
* @param roomId chatid or channelId
|
||||
* @param userid
|
||||
* @param files
|
||||
* @param listener
|
||||
*/
|
||||
async uploadFiles(roomId: string, userid: string, files: FileData[], listener: FileUploadProgressListener): Promise<string> {
|
||||
let registrations: FileUploadRegistration[] = [];
|
||||
|
||||
files.forEach(file => {
|
||||
registrations.push({
|
||||
fileId: file.fileId,
|
||||
name: file.name,
|
||||
type: file.type,
|
||||
size: file.data.size,
|
||||
})
|
||||
})
|
||||
|
||||
try {
|
||||
const resp = await this.client.post<RegisterUploadResp>("chat/cdnRegisterUpload", <RegisterUploadReq>{
|
||||
roomId: roomId,
|
||||
userid: userid,
|
||||
files: registrations,
|
||||
});
|
||||
for (let filesUploaded = 0; filesUploaded < files.length; filesUploaded++) {
|
||||
await this.uploadFile(resp.data.uploadId, roomId, userid, files[filesUploaded], registrations[filesUploaded], listener)
|
||||
}
|
||||
await this.finishUpload(roomId, userid, resp.data.uploadId)
|
||||
return resp.data.uploadId
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
private async finishUpload(roomId: string, userid: string, uploadId: string): Promise<void> {
|
||||
try {
|
||||
await this.cdnClient.post("chat/finishUpload", <FinishUploadReq>{
|
||||
roomId: roomId,
|
||||
userid: userid,
|
||||
uploadId: uploadId
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
private async uploadFile(uploadId: string, roomId: string, userid: string, file: FileData, registration: FileUploadRegistration, listener: FileUploadProgressListener): Promise<void> {
|
||||
const chunkSize = this.calculateChunkSize(file.data.size);
|
||||
const totalChunks = Math.ceil(file.data.size / chunkSize);
|
||||
|
||||
const arrayBuffer = await file.data.arrayBuffer();
|
||||
|
||||
for (let i = 0; i < totalChunks; i++) {
|
||||
const start = i * chunkSize;
|
||||
const end = Math.min(start + chunkSize, file.data.size);
|
||||
const chunk = new Uint8Array(arrayBuffer.slice(start, end));
|
||||
const base64 = this.uint8ToBase64(chunk);
|
||||
await this.uploadChunk(uploadId, roomId, userid, registration.fileId, base64);
|
||||
listener.fileProgressUpdate(file.fileId, totalChunks, i)
|
||||
}
|
||||
}
|
||||
|
||||
private uint8ToBase64(uint8: Uint8Array): string {
|
||||
let binString = "";
|
||||
for (let i = 0; i < uint8.length; i++) {
|
||||
binString += String.fromCharCode(uint8[i]);
|
||||
}
|
||||
return btoa(binString);
|
||||
}
|
||||
|
||||
private async uploadChunk(uploadId: string, roomId: string, userid: string, fileId: string, chunk: string): Promise<void> {
|
||||
try {
|
||||
await this.cdnClient.post<RegisterUploadResp>("chat/uploadChunk", <ChunkUploadReq>{
|
||||
roomId: roomId,
|
||||
userid: userid,
|
||||
fileId: fileId,
|
||||
chunk: chunk,
|
||||
uploadId: uploadId,
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -6,7 +6,7 @@ import {getClient} from "../core/http";
|
||||
import {environment, SDKConfig} from "../core/environment";
|
||||
|
||||
describe("NetworkService", () => {
|
||||
const service = new NetworkService("", "", "", new DatabaseMock(), (action, data) => {})
|
||||
const service = new NetworkService("", "", "", new DatabaseMock(), getClient(false))
|
||||
|
||||
it('should get invites', async () => {
|
||||
const invites = await service.getInvites();
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import {DatabaseAPI} from "../storage/database";
|
||||
import {AuthMethods} from "../domain/authService.schema";
|
||||
import {getClient} from "../core/http";
|
||||
import {AxiosInstance, isAxiosError} from "axios";
|
||||
import {GenericErrorBody} from "../domain/http.schema";
|
||||
@@ -17,9 +18,7 @@ import {
|
||||
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";
|
||||
import {http} from "msw";
|
||||
|
||||
export class NetworkService {
|
||||
userid: string;
|
||||
@@ -27,26 +26,15 @@ export class NetworkService {
|
||||
database: DatabaseAPI;
|
||||
client: AxiosInstance
|
||||
|
||||
constructor(userid: string, token: string, networkId: string, database: DatabaseAPI, wsMessageListener: MessageListener) {
|
||||
constructor(userid: string, token: string, networkId: string, database: DatabaseAPI, httpClientOverwrite: AxiosInstance | null) {
|
||||
this.userid = userid;
|
||||
this.networkId = networkId;
|
||||
this.database = database;
|
||||
this.client = getClient(false).create({
|
||||
this.client = (httpClientOverwrite ?? getClient(false)).create({
|
||||
headers: {
|
||||
"Authorization": token,
|
||||
"X-WS-ID": WebSocketHandler.getInstance().connId
|
||||
"Authorization": token
|
||||
}
|
||||
})
|
||||
WebSocketHandler.getInstance().registerService({
|
||||
identifier: networkId,
|
||||
onNewConnId: this.onNewConnId,
|
||||
onNewMessage: wsMessageListener,
|
||||
})
|
||||
}
|
||||
|
||||
private onNewConnId(newConnId: string) {
|
||||
console.log("NetworkService: New connection id")
|
||||
this.client.defaults.headers["X-WS-ID"] = newConnId;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -98,7 +86,6 @@ export class NetworkService {
|
||||
const resp = await this.client.post<Network[]>("network/get", <GetNetworksReq>{
|
||||
userid: this.userid,
|
||||
});
|
||||
this.database.set("networks", this.userid, JSON.stringify(resp.data))
|
||||
return resp.data
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
@@ -108,22 +95,13 @@ export class NetworkService {
|
||||
}
|
||||
}
|
||||
|
||||
getQuick(): Message[] {
|
||||
const networks = this.database.get("networks", this.userid)
|
||||
if (networks) {
|
||||
return JSON.parse(networks)
|
||||
} else {
|
||||
throw new Error("No networks in database")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Accepts the invite and joins the network
|
||||
* @param inviteId
|
||||
*/
|
||||
async acceptInvite(inviteId: string): Promise<void> {
|
||||
try {
|
||||
await this.client.post("network/acceptInvite", <AcceptInviteReq>{
|
||||
const resp = await this.client.post("network/acceptInvite", <AcceptInviteReq>{
|
||||
userid: this.userid,
|
||||
inviteId: inviteId,
|
||||
});
|
||||
@@ -874,7 +852,7 @@ export class NetworkService {
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetches network data from an invitation
|
||||
* Fetches network data from an invite
|
||||
* @param inviteId
|
||||
*/
|
||||
async getFromInvite(inviteId: string): Promise<Network> {
|
||||
|
||||
@@ -4,7 +4,7 @@ import {DatabaseMock} from "../mocks/storage/database";
|
||||
import {faker} from "@faker-js/faker/locale/en";
|
||||
|
||||
describe("PictureService", () => {
|
||||
const service = new PictureService("", "", "", new DatabaseMock())
|
||||
const service = new PictureService("", "", "", new DatabaseMock(), null, null)
|
||||
|
||||
it('should get pictures', async () => {
|
||||
const uploads = await service.get()
|
||||
|
||||
@@ -12,7 +12,6 @@ import {
|
||||
GetResp, PostCommentReq, ToggleFollowReq, TogglePictureLikeReq, UploadImageReq
|
||||
} from "../domain/pictureService.schema";
|
||||
import {environment} from "../core/environment";
|
||||
import {Message} from "../domain/dmService.schema";
|
||||
|
||||
export class PictureService {
|
||||
userid: string;
|
||||
@@ -21,16 +20,16 @@ export class PictureService {
|
||||
client: AxiosInstance
|
||||
cdnClient: AxiosInstance
|
||||
|
||||
constructor(token: string, uploaderId: string, userid: string, database: DatabaseAPI) {
|
||||
constructor(token: string, uploaderId: string, userid: string, database: DatabaseAPI, httpClientOverwrite: AxiosInstance | null, cdnClientOverwrite: AxiosInstance | null) {
|
||||
this.userid = userid;
|
||||
this.uploaderId = uploaderId;
|
||||
this.database = database;
|
||||
this.client = getClient(false).create({
|
||||
this.client = (httpClientOverwrite ?? getClient(false)).create({
|
||||
headers: {
|
||||
"Authorization": token
|
||||
}
|
||||
})
|
||||
this.cdnClient = getClient(true).create({
|
||||
this.cdnClient = (cdnClientOverwrite ?? getClient(true)).create({
|
||||
headers: {
|
||||
"Authorization": token
|
||||
}
|
||||
@@ -43,7 +42,6 @@ export class PictureService {
|
||||
async get(): Promise<GetResp> {
|
||||
try {
|
||||
const resp = await this.client.get<GetResp>(`picture/pictures?userid=${this.userid}&target=${this.uploaderId}`);
|
||||
this.database.set("pictures", this.uploaderId, JSON.stringify(resp.data))
|
||||
return resp.data
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
@@ -54,15 +52,6 @@ export class PictureService {
|
||||
}
|
||||
}
|
||||
|
||||
getQuick(): Message[] {
|
||||
const pictures = this.database.get("pictures", this.uploaderId)
|
||||
if (pictures) {
|
||||
return JSON.parse(pictures)
|
||||
} else {
|
||||
throw new Error("No pictures in database")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetches the top 10 most liked and newest pictures
|
||||
*/
|
||||
|
||||
@@ -1,133 +0,0 @@
|
||||
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 {AxiosInstance} from "axios";
|
||||
import {getClient} from "../core/http";
|
||||
import {PersonalUserData} from "../domain/userService.schema";
|
||||
|
||||
export class SessionManager {
|
||||
client: AxiosInstance;
|
||||
database: DatabaseAPI;
|
||||
keyring: KeyringAPI;
|
||||
KeyValue: KeyValueAPI;
|
||||
|
||||
constructor(database: DatabaseAPI, keyring: KeyringAPI, KeyValue: KeyValueAPI) {
|
||||
this.database = database;
|
||||
this.keyring = keyring;
|
||||
this.KeyValue = KeyValue;
|
||||
this.client = getClient(false)
|
||||
}
|
||||
|
||||
/**
|
||||
* Saves the new session to the database and the keyring
|
||||
* @param userData
|
||||
* @param token
|
||||
*/
|
||||
addSession(userData: PublicUserData, token: string): void {
|
||||
this.database.set("sessions", userData.userid, JSON.stringify(userData))
|
||||
this.keyring.set(userData.userid, token)
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads all saved sessions
|
||||
*/
|
||||
loadSessions(): Session[] {
|
||||
const tokens = this.keyring.getAll()
|
||||
const sessions: Session[] = []
|
||||
tokens.forEach(token => {
|
||||
const userData = this.database.get("sessions", token.split(".")[0])
|
||||
if (userData) {
|
||||
sessions.push({
|
||||
token: token,
|
||||
userData: JSON.parse(userData)
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
return sessions
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the preferred user set by the client
|
||||
*/
|
||||
getPreferredUser(): string {
|
||||
return this.KeyValue.get("preferredUser") ?? ""
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets a new preferred user
|
||||
* @param userid
|
||||
*/
|
||||
setPreferredUser(userid: string): void {
|
||||
this.KeyValue.set("preferredUser", userid)
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads the preferred session by the client
|
||||
*/
|
||||
loadPreferredSession() {
|
||||
const sessions = this.loadSessions()
|
||||
let preferredUser = this.getPreferredUser()
|
||||
if (preferredUser == "") {
|
||||
preferredUser = sessions[0].userData.userid
|
||||
this.setPreferredUser(sessions[0].userData.userid)
|
||||
}
|
||||
|
||||
const preferredSession = sessions.find(s => s.userData.userid == preferredUser)
|
||||
if (preferredSession) {
|
||||
return preferredSession
|
||||
} else {
|
||||
return sessions[0]
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Validates and updates all sessions and returns with a new session list
|
||||
* @param sessions
|
||||
*/
|
||||
updateSessions(sessions: Session[]): Session[] {
|
||||
sessions.forEach(async session => {
|
||||
const index = sessions.indexOf(session)
|
||||
if (!await this.validateSession(session.token)) {
|
||||
this.database.delete("sessions", session.userData.userid)
|
||||
this.keyring.delete(session.userData.userid)
|
||||
sessions.splice(index, 1)
|
||||
}
|
||||
|
||||
const updatedUserData = await this.updateUserData(session)
|
||||
this.database.set("sessions", session.userData.userid, updatedUserData)
|
||||
sessions[index] = updatedUserData
|
||||
})
|
||||
|
||||
return sessions
|
||||
}
|
||||
|
||||
private async validateSession(token: string): Promise<boolean> {
|
||||
try {
|
||||
const resp = await this.client.post<ValidateSessionResp>("v2/user/validateSession", <ValidateSessionReq>{
|
||||
token: token,
|
||||
})
|
||||
return resp.data.validationOk
|
||||
} catch (e) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
private async updateUserData(session: Session): Promise<Session> {
|
||||
const authenticatedClient = this.client.create({
|
||||
headers: {
|
||||
"Authorization": session.token,
|
||||
}
|
||||
})
|
||||
|
||||
try {
|
||||
const resp = await authenticatedClient.get<PersonalUserData>(`user/byUseridPersonal?userid=${session.userData.userid}`)
|
||||
session.userData = resp.data
|
||||
return session
|
||||
} catch (e) {
|
||||
throw new Error("Session update error")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,280 +0,0 @@
|
||||
import {DatabaseAPI} from "../storage/database";
|
||||
import {AxiosInstance, isAxiosError} from "axios";
|
||||
import {MessageListener} from "../domain/websocket.schema";
|
||||
import {getClient} from "../core/http";
|
||||
import {WebSocketHandler} from "../core/webSocketHandler";
|
||||
import {
|
||||
DeleteMessagesReq,
|
||||
EditMessageReq,
|
||||
FinishMessageReq,
|
||||
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";
|
||||
|
||||
export class TextChannelServiceService {
|
||||
userid: string;
|
||||
networkId: string;
|
||||
categoryId: string;
|
||||
channelId: string;
|
||||
token: string;
|
||||
database: DatabaseAPI;
|
||||
client: AxiosInstance
|
||||
|
||||
constructor(userid: string, token: string, networkId: string, categoryId: string, channelId: string, database: DatabaseAPI, wsMessageListener: MessageListener) {
|
||||
this.userid = userid;
|
||||
this.networkId = networkId;
|
||||
this.categoryId = categoryId;
|
||||
this.channelId = channelId;
|
||||
this.database = database;
|
||||
this.token = token;
|
||||
this.client = getClient(false).create({
|
||||
headers: {
|
||||
"Authorization": token,
|
||||
"X-WS-ID": WebSocketHandler.getInstance().connId
|
||||
}
|
||||
})
|
||||
WebSocketHandler.getInstance().registerService({
|
||||
identifier: channelId,
|
||||
onNewConnId: this.onNewConnId,
|
||||
onNewMessage: wsMessageListener,
|
||||
})
|
||||
}
|
||||
|
||||
private onNewConnId(newConnId: string) {
|
||||
console.log("NetworkService: New connection id")
|
||||
this.client.defaults.headers["X-WS-ID"] = newConnId;
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetches all messages in the chat
|
||||
* @param from
|
||||
*/
|
||||
async get(from: number = 0): Promise<Message[]> {
|
||||
try {
|
||||
const resp = await this.client.get<Message[]>(`network/channel/messages?networkId=${this.networkId}&channelId=${this.channelId}&categoryId=${this.categoryId}&userid=${this.userid}&from=${from}`);
|
||||
if (from == 0) {
|
||||
this.database.set("networkmessages", this.channelId, JSON.stringify(resp.data))
|
||||
}
|
||||
console.log(resp.data, "ASD")
|
||||
return resp.data
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
getQuick(): Message[] {
|
||||
const messages = this.database.get("networkmessages", this.channelId)
|
||||
if (messages) {
|
||||
return JSON.parse(messages)
|
||||
} else {
|
||||
throw new Error("No messages in database")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetches the position of the specified message which can be used in get() to fetch an old message with it's surrounding messages
|
||||
* @param messageId
|
||||
*/
|
||||
async getMessagePos(messageId: string): Promise<number> {
|
||||
try {
|
||||
const resp = await this.client.get<GetMessagePosResp>(`network/channel/getMessagePosition?networkId=${this.networkId}&channelId=${this.channelId}&categoryId=${this.categoryId}&userid=${this.userid}&messageId=${messageId}`);
|
||||
return resp.data.messagePos
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets all messages pinned in the chat
|
||||
*/
|
||||
async getPinnedMessages(): Promise<PinnedMessage[]> {
|
||||
try {
|
||||
const resp = await this.client.get<PinnedMessage[]>(`network/channel/pinnedMessages?networkId=${this.networkId}&channelId=${this.channelId}&categoryId=${this.categoryId}&userid=${this.userid}`);
|
||||
return resp.data
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Edits the specified message
|
||||
* @param messageId
|
||||
* @param newMessage
|
||||
*/
|
||||
async editMessage(messageId: string, newMessage: string): Promise<void> {
|
||||
try {
|
||||
const resp = await this.client.patch("network/channel/editMessage", <EditMessageReq>{
|
||||
messageId: messageId,
|
||||
networkId: this.networkId,
|
||||
channelId: this.channelId,
|
||||
categoryId: this.categoryId,
|
||||
userid: this.userid,
|
||||
message: newMessage
|
||||
});
|
||||
return resp.data
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sends a new message to the chat
|
||||
* @param message
|
||||
* @param replyTo
|
||||
* @param replyToMessage
|
||||
* @param attachments
|
||||
* @param progressListener
|
||||
*/
|
||||
async sendMessage(message: string, replyTo: string | null = null, replyToMessage: string | null = null, attachments: FileData[] | null = null, progressListener: FileUploadProgressListener | null = null): Promise<Message> {
|
||||
let uploadId = ""
|
||||
if (attachments) {
|
||||
const uploader = new FileUploadService(this.token)
|
||||
uploadId = await uploader.uploadFiles(this.channelId, this.userid, attachments, progressListener!)
|
||||
}
|
||||
try {
|
||||
const resp = await this.client.post<Message>("network/channel/finishMessage", <FinishMessageReq>{
|
||||
message: message,
|
||||
networkId: this.networkId,
|
||||
channelId: this.channelId,
|
||||
categoryId: this.categoryId,
|
||||
replyTo: replyTo,
|
||||
replyToMessage: replyToMessage,
|
||||
userid: this.userid,
|
||||
uploadId: uploadId,
|
||||
});
|
||||
return resp.data
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Reads all messages sent to you in the chat
|
||||
*/
|
||||
async readMessages(): Promise<void> {
|
||||
try {
|
||||
await this.client.patch("network/channel/readMessages", <ReadMessagesReq>{
|
||||
networkId: this.networkId,
|
||||
channelId: this.channelId,
|
||||
categoryId: this.categoryId,
|
||||
userid: this.userid,
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Pins the specified message
|
||||
* @param messageId
|
||||
* @param message
|
||||
*/
|
||||
async pinMessage(messageId: string, message: string): Promise<void> {
|
||||
try {
|
||||
const resp = await this.client.patch("network/channel/pinMessage", <PinMessageReq>{
|
||||
messageId: messageId,
|
||||
networkId: this.networkId,
|
||||
channelId: this.channelId,
|
||||
categoryId: this.categoryId,
|
||||
userid: this.userid,
|
||||
message: message
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Unpins the specified message
|
||||
* @param messageId
|
||||
*/
|
||||
async unpinMessage(messageId: string): Promise<void> {
|
||||
try {
|
||||
const resp = await this.client.patch("network/channel/unpinMessage", <UnpinMessageReq>{
|
||||
messageId: messageId,
|
||||
networkId: this.networkId,
|
||||
channelId: this.channelId,
|
||||
categoryId: this.categoryId,
|
||||
userid: this.userid,
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes the message(s)
|
||||
* @param messageIds
|
||||
*/
|
||||
async deleteMessages(messageIds: string[]): Promise<void> {
|
||||
try {
|
||||
const resp = await this.client.patch("network/channel/deleteMessages", <DeleteMessagesReq>{
|
||||
networkId: this.networkId,
|
||||
channelId: this.channelId,
|
||||
categoryId: this.categoryId,
|
||||
userid: this.userid,
|
||||
messageIds: messageIds
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Joins the WebSocket room to start receiving realtime messages
|
||||
*/
|
||||
async joinWebSocketRoom(): Promise<void> {
|
||||
try {
|
||||
const resp = await this.client.patch("network/channel/joinWebSocketRoom", <JoinWsRoomReq>{
|
||||
networkId: this.networkId,
|
||||
channelId: this.channelId,
|
||||
categoryId: this.categoryId,
|
||||
userid: this.userid,
|
||||
connId: WebSocketHandler.getInstance().connId,
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
import {describe, expect, it} from "vitest";
|
||||
import {UserService} from "./userService";
|
||||
import {DatabaseMock} from "../mocks/storage/database";
|
||||
|
||||
describe("UserService", () => {
|
||||
const service = new UserService("", "", new DatabaseMock())
|
||||
|
||||
it('should get all sessions', async () => {
|
||||
const sessions = await service.getSessions()
|
||||
expect(sessions[0].token).toBe("sessionToken")
|
||||
});
|
||||
})
|
||||
@@ -1,253 +0,0 @@
|
||||
import {DatabaseAPI} from "../storage/database";
|
||||
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 {
|
||||
ChangeDisplayNameReq,
|
||||
ChangeEmailReq,
|
||||
ChangePasswordReq, ChangePhoneReq,
|
||||
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";
|
||||
|
||||
export class UserService {
|
||||
userid: string;
|
||||
database: DatabaseAPI;
|
||||
client: AxiosInstance
|
||||
cdnClient: AxiosInstance
|
||||
|
||||
constructor(userid: string, token: string, database: DatabaseAPI) {
|
||||
this.userid = userid;
|
||||
this.database = database;
|
||||
this.client = getClient(false).create({
|
||||
headers: {
|
||||
"Authorization": token,
|
||||
}
|
||||
})
|
||||
this.cdnClient = getClient(true).create({
|
||||
headers: {
|
||||
"Authorization": token,
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
async changeUsername(username: string): Promise<void> {
|
||||
try {
|
||||
await this.client.patch("user/changeUsername", <ChangeUsernameReq>{
|
||||
userid: this.userid,
|
||||
newUsername: username,
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
async changeDisplayName(displayName: string): Promise<void> {
|
||||
try {
|
||||
await this.client.patch("user/changeDisplayName", <ChangeDisplayNameReq>{
|
||||
userid: this.userid,
|
||||
newDisplayName: displayName
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
async changePassword(newPassword: string, currentPassword: string): Promise<void> {
|
||||
try {
|
||||
await this.client.patch("user/changePassword", <ChangePasswordReq>{
|
||||
userid: this.userid,
|
||||
currentPassword: currentPassword,
|
||||
newPassword: newPassword,
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
async changeEmail(newMail: string, currentPassword: string): Promise<void|CurrNewCodeTestingResp> {
|
||||
try {
|
||||
const resp = await this.client.patch<CurrNewCodeTestingResp>("user/changeEmail", <ChangeEmailReq>{
|
||||
userid: this.userid,
|
||||
currentPassword: currentPassword,
|
||||
newMail: newMail,
|
||||
});
|
||||
if (resp.data.codeCurr != null) {
|
||||
return resp.data
|
||||
} else {
|
||||
return
|
||||
}
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
async uploadNewPfp(pfpId: string): Promise<void> {
|
||||
try {
|
||||
await this.client.patch("user/uploadNewPfp", <UploadNewPfpReq>{
|
||||
userid: this.userid,
|
||||
pfpId: pfpId,
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
async uploadNewPfpCdn(image: string | null, monogramLetter: string | null, monogramColors: RGB): Promise<string> {
|
||||
try {
|
||||
const resp = await this.cdnClient.post<UploadNewPfpCdnResp>("pfp", <UploadNewPfpCdnReq>{
|
||||
userid: this.userid,
|
||||
data: image,
|
||||
monogramColors: JSON.stringify(monogramColors),
|
||||
isImage: image !== null,
|
||||
monogramLetter: monogramLetter,
|
||||
});
|
||||
console.log(resp.data.pfpId, "PFPID")
|
||||
return resp.data.pfpId
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
async verifyEmailChange(vCodeCurrent: number, vCodeNew: number, newAddress: string): Promise<void> {
|
||||
try {
|
||||
await this.client.patch("user/verifyMailChange", <VerifyMailChangeReq>{
|
||||
userid: this.userid,
|
||||
newAddress: newAddress,
|
||||
vCodeCurrent: vCodeCurrent,
|
||||
vCodeNew: vCodeNew,
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
async delete(password: string): Promise<void> {
|
||||
try {
|
||||
await this.client.post("user/deleteAccount", <DeleteReq>{
|
||||
userid: this.userid,
|
||||
password: password
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
async registerFirebaseToken(fcmToken: string): Promise<void> {
|
||||
try {
|
||||
await this.client.post("user/registerFcmToken", <RegisterFCMTokenReq>{
|
||||
userid: this.userid,
|
||||
token: fcmToken,
|
||||
});
|
||||
return
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
async getSessions(): Promise<Session[]> {
|
||||
try {
|
||||
const resp = await this.client.post<Session[]>("user/getSessions", <GetSessionsReq>{
|
||||
userid: this.userid,
|
||||
});
|
||||
return resp.data
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
async toggleGIFSave(url: string): Promise<GIF> {
|
||||
try {
|
||||
const resp = await this.client.patch<GIF>("user/toggleGIFSave", <ToggleGifSaveReq>{
|
||||
userid: this.userid,
|
||||
url: url
|
||||
});
|
||||
return resp.data
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
async changePhoneNumber(currentPassword: string, newPhone: string): Promise<CurrNewCodeTestingResp|void> {
|
||||
try {
|
||||
const resp = await this.client.patch<CurrNewCodeTestingResp>("user/changePhone", <ChangePhoneReq>{
|
||||
userid: this.userid,
|
||||
newPhone: newPhone,
|
||||
currentPassword: currentPassword,
|
||||
});
|
||||
if (resp.data.codeCurr != null) {
|
||||
return resp.data
|
||||
} else {
|
||||
return
|
||||
}
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
|
||||
async verifyPhoneNumberChange(newPhone: string, vCodeCurrent: number, vCodeNew: number): Promise<void> {
|
||||
try {
|
||||
const resp = await this.client.patch("user/verifyPhoneChange", <VerifyPhoneChange>{
|
||||
userid: this.userid,
|
||||
newPhone: newPhone,
|
||||
vCodeCurrent: vCodeCurrent,
|
||||
vCodeNew: vCodeNew,
|
||||
});
|
||||
return resp.data
|
||||
} catch (e) {
|
||||
if (isAxiosError<GenericErrorBody>(e)) {
|
||||
throw e;
|
||||
}
|
||||
throw new Error("Unexpected error")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
export interface KeyringAPI {
|
||||
set(key: string, value: any): void;
|
||||
get(key: string): string;
|
||||
getAll(): string[];
|
||||
delete(key: string): void;
|
||||
flush(): void;
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
export interface KeyValueAPI {
|
||||
set(key: string, value: any): void;
|
||||
get(key: string): string;
|
||||
delete(key: string): void;
|
||||
flush(): void;
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
import {describe, expect, it} from "vitest";
|
||||
import {BroadcastChannelService} from "../src/services/broadcastChannelService";
|
||||
|
||||
const BRC_CHAN_SERVICE_TESTING_NETWORK_ID = "000000000000000000000000"
|
||||
const BRC_CHAN_SERVICE_TESTING_USER_ID = "000000000000000000000000"
|
||||
const BRC_CHAN_SERVICE_TESTING_CHANNEL_ID = "333333333333333333333333"
|
||||
const BRC_CHAN_SERVICE_TESTING_TOKEN = "testingToken"
|
||||
const BRC_CHAN_SERVICE_TESTING_CATEGORY_ID = "111111111111111111111111"
|
||||
|
||||
describe("BroadcastChannelService Integration Testing", () => {
|
||||
const service = new BroadcastChannelService(
|
||||
BRC_CHAN_SERVICE_TESTING_TOKEN,
|
||||
BRC_CHAN_SERVICE_TESTING_USER_ID,
|
||||
BRC_CHAN_SERVICE_TESTING_NETWORK_ID,
|
||||
BRC_CHAN_SERVICE_TESTING_CATEGORY_ID,
|
||||
BRC_CHAN_SERVICE_TESTING_CHANNEL_ID,
|
||||
(action, data) => {}
|
||||
)
|
||||
|
||||
it('should create a new server and fetch it', async () => {
|
||||
await service.createServer()
|
||||
const registry = await service.getData()
|
||||
expect(registry.status).toBe("idling")
|
||||
});
|
||||
|
||||
it('should join ws room', async () => {
|
||||
await service.joinWebSocketRoom()
|
||||
});
|
||||
})
|
||||
@@ -1,14 +0,0 @@
|
||||
import {describe, expect, it} from "vitest";
|
||||
import {DatabaseMock} from "../src/mocks/storage/database";
|
||||
import {ChatService} from "../src/services/chatService";
|
||||
|
||||
describe("ChatService Integration Testing", () => {
|
||||
const CHAT_SERVICE_TESTING_USER_ID = "000000000000000000000000"
|
||||
const CHAT_SERVICE_TESTING_TOKEN = "testingToken"
|
||||
const service = new ChatService(CHAT_SERVICE_TESTING_USER_ID, CHAT_SERVICE_TESTING_TOKEN, new DatabaseMock(), () => {})
|
||||
|
||||
it('should get chats', async () => {
|
||||
const chats = await service.get()
|
||||
expect(chats[0].username).toBe("bob")
|
||||
})
|
||||
})
|
||||
@@ -1,61 +0,0 @@
|
||||
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 {faker} from "@faker-js/faker/locale/en";
|
||||
|
||||
describe("DmService Integration Testing", () => {
|
||||
const DM_SERVICE_TESTING_CHAT_ID = "000000000000000000000000"
|
||||
const DM_SERVICE_TESTING_USER_ID = "000000000000000000000000"
|
||||
const DM_SERVICE_TESTING_MESSAGE_ID = "111111111111111111111111"
|
||||
const DM_SERVICE_TESTING_TOKEN = "testingToken"
|
||||
|
||||
const service = new DMService(
|
||||
DM_SERVICE_TESTING_USER_ID,
|
||||
DM_SERVICE_TESTING_TOKEN,
|
||||
DM_SERVICE_TESTING_CHAT_ID,
|
||||
new DatabaseMock(),
|
||||
() => {}
|
||||
)
|
||||
|
||||
it('should get messages', async () => {
|
||||
const messages = await service.get()
|
||||
expect(messages[0].message).toBe("This is a message")
|
||||
expect(messages[0].isEdited).toBeTruthy()
|
||||
});
|
||||
|
||||
it('should get message position', async () => {
|
||||
const pos = await service.getMessagePos(DM_SERVICE_TESTING_MESSAGE_ID)
|
||||
expect(pos).toBe(0)
|
||||
});
|
||||
|
||||
it('should edit message', async () => {
|
||||
const newMessage = faker.lorem.paragraph()
|
||||
await service.editMessage(DM_SERVICE_TESTING_MESSAGE_ID, newMessage)
|
||||
const messages = await service.get()
|
||||
expect(messages[0].message).toBe(newMessage)
|
||||
});
|
||||
|
||||
it('should send a message', async () => {
|
||||
const message = faker.lorem.paragraph()
|
||||
const newMessage = await service.sendMessage(message)
|
||||
expect(newMessage.message).toBe(message)
|
||||
});
|
||||
|
||||
it('should read messages', async () => {
|
||||
await service.readMessages()
|
||||
});
|
||||
|
||||
it('should pin and unpin messages', async () => {
|
||||
let pinnedMessages = await service.getPinnedMessages()
|
||||
expect(pinnedMessages.length).toBe(0)
|
||||
|
||||
await service.pinMessage(DM_SERVICE_TESTING_MESSAGE_ID, "message")
|
||||
pinnedMessages = await service.getPinnedMessages()
|
||||
expect(pinnedMessages.length).toBe(1)
|
||||
|
||||
await service.unpinMessage(DM_SERVICE_TESTING_MESSAGE_ID)
|
||||
pinnedMessages = await service.getPinnedMessages()
|
||||
expect(pinnedMessages.length).toBe(0)
|
||||
});
|
||||
})
|
||||
@@ -1,37 +0,0 @@
|
||||
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 axios from "axios";
|
||||
import {v4 as uuidv4} from 'uuid';
|
||||
|
||||
describe("FileUploadService Integration Testing", () => {
|
||||
const FILE_UPL_SERVICE_TESTING_USER_ID = "000000000000000000000000"
|
||||
const FILE_UPL_SERVICE_TESTING_CHAT_ID = "000000000000000000000000"
|
||||
const FILE_UPL_SERVICE_TESTING_TOKEN = "testingToken"
|
||||
|
||||
it('should upload all files', async () => {
|
||||
const response = await axios.get("https://picsum.photos/500", {
|
||||
responseType: 'blob'
|
||||
});
|
||||
|
||||
const service = new FileUploadService(FILE_UPL_SERVICE_TESTING_TOKEN);
|
||||
await service.uploadFiles(
|
||||
FILE_UPL_SERVICE_TESTING_CHAT_ID,
|
||||
FILE_UPL_SERVICE_TESTING_USER_ID,
|
||||
[
|
||||
{
|
||||
fileId: uuidv4(),
|
||||
name: "filename",
|
||||
type: "image",
|
||||
extension: "jpeg",
|
||||
data: new File([response.data], "filename", { type: "image/jpeg" })
|
||||
}
|
||||
],
|
||||
{
|
||||
fileProgressUpdate: () => {},
|
||||
}
|
||||
)
|
||||
});
|
||||
})
|
||||
@@ -18,12 +18,13 @@ const NETWORK_SERVICE_TESTING_INVITE_ID = "444444444444444444444444"
|
||||
const NETWORK_SERVICE_TESTING_TOKEN = "testingToken"
|
||||
|
||||
describe("NetworkService Integration Testing", () => {
|
||||
environment.overwrite(<SDKConfig>{apiUrl: "http://localhost:3000"})
|
||||
const service = new NetworkService(
|
||||
NETWORK_SERVICE_TESTING_USER_ID,
|
||||
NETWORK_SERVICE_TESTING_TOKEN,
|
||||
NETWORK_SERVICE_TESTING_NETWORK_ID,
|
||||
new DatabaseMock(),
|
||||
(action, data) => {}
|
||||
getClient(false),
|
||||
)
|
||||
|
||||
it("should get invites", async () => {
|
||||
@@ -56,6 +57,12 @@ describe("NetworkService Integration Testing", () => {
|
||||
expect(category.name).toBe(catName)
|
||||
});
|
||||
|
||||
it('should delete category', async () => {
|
||||
await service.deleteCategory(NETWORK_SERVICE_TESTING_CATEGORY_ID)
|
||||
const networks = await service.get()
|
||||
expect(networks[0].categories.length).toBe(0)
|
||||
});
|
||||
|
||||
it('should move category', async () => {
|
||||
await service.createCategory("Test name", "Test desc")
|
||||
await service.moveCategory(0, 1)
|
||||
@@ -68,7 +75,7 @@ describe("NetworkService Integration Testing", () => {
|
||||
});
|
||||
|
||||
it('should create rank', async () => {
|
||||
const rankName = faker.internet.displayName().substring(0, 10)
|
||||
const rankName = faker.internet.displayName()
|
||||
const rank = await service.createRank(rankName, <RGB>{r: 0, g: 0, b: 0}, null)
|
||||
expect(rank.name).toBe(rankName)
|
||||
});
|
||||
|
||||
@@ -11,11 +11,14 @@ const PICTURE_SERVICE_TESTING_USER_ID = "000000000000000000000000"
|
||||
const PICTURE_SERVICE_TESTING_IMAGE_ID = "111111111111111111111111"
|
||||
|
||||
describe("PictureService Integration Test", () => {
|
||||
environment.overwrite(<SDKConfig>{apiUrl: "http://localhost:3000", cdnUrl: "http://localhost:4000"})
|
||||
const service = new PictureService(
|
||||
PICTURE_SERVICE_TESTING_TOKEN,
|
||||
PICTURE_SERVICE_TESTING_USER_ID,
|
||||
PICTURE_SERVICE_TESTING_USER_ID,
|
||||
new DatabaseMock()
|
||||
new DatabaseMock(),
|
||||
getClient(false),
|
||||
getClient(true),
|
||||
)
|
||||
|
||||
it('should get uploads', async () => {
|
||||
@@ -24,7 +27,7 @@ describe("PictureService Integration Test", () => {
|
||||
});
|
||||
|
||||
it('should create an album', async () => {
|
||||
const albumName = faker.internet.displayName().substring(0, 10)
|
||||
const albumName = faker.internet.displayName()
|
||||
await service.createAlbum(albumName)
|
||||
const uploads = await service.get()
|
||||
expect(uploads.pictures[1].name).toBe(albumName)
|
||||
|
||||
@@ -1,66 +0,0 @@
|
||||
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 {faker} from "@faker-js/faker/locale/en";
|
||||
import {TextChannelServiceService} from "../src/services/textChannelService";
|
||||
|
||||
describe("DmService Integration Testing", () => {
|
||||
const TXT_CHAN_SERVICE_TESTING_CHANNEL_ID = "222222222222222222222222"
|
||||
const TXT_CHAN_SERVICE_TESTING_USER_ID = "000000000000000000000000"
|
||||
const TXT_CHAN_SERVICE_TESTING_MESSAGE_ID = "111111111111111111111111"
|
||||
const TXT_CHAN_SERVICE_TESTING_TOKEN = "testingToken"
|
||||
const NETWORK_SERVICE_TESTING_NETWORK_ID = "000000000000000000000000"
|
||||
const NETWORK_SERVICE_TESTING_CATEGORY_ID = "111111111111111111111111"
|
||||
|
||||
const service = new TextChannelServiceService(
|
||||
TXT_CHAN_SERVICE_TESTING_USER_ID,
|
||||
TXT_CHAN_SERVICE_TESTING_TOKEN,
|
||||
NETWORK_SERVICE_TESTING_NETWORK_ID,
|
||||
NETWORK_SERVICE_TESTING_CATEGORY_ID,
|
||||
TXT_CHAN_SERVICE_TESTING_CHANNEL_ID,
|
||||
new DatabaseMock(),
|
||||
() => {}
|
||||
)
|
||||
|
||||
it('should get messages', async () => {
|
||||
const messages = await service.get()
|
||||
expect(messages[0].message).toBe("This is a message")
|
||||
expect(messages[0].isEdited).toBeTruthy()
|
||||
});
|
||||
|
||||
it('should get message position', async () => {
|
||||
const pos = await service.getMessagePos(TXT_CHAN_SERVICE_TESTING_MESSAGE_ID)
|
||||
expect(pos).toBe(0)
|
||||
});
|
||||
|
||||
it('should edit message', async () => {
|
||||
const newMessage = faker.lorem.paragraph()
|
||||
await service.editMessage(TXT_CHAN_SERVICE_TESTING_MESSAGE_ID, newMessage)
|
||||
const messages = await service.get()
|
||||
expect(messages[0].message).toBe(newMessage)
|
||||
});
|
||||
|
||||
it('should send a message', async () => {
|
||||
const message = faker.lorem.paragraph()
|
||||
const newMessage = await service.sendMessage(message)
|
||||
expect(newMessage.message).toBe(message)
|
||||
});
|
||||
|
||||
it('should read messages', async () => {
|
||||
await service.readMessages()
|
||||
});
|
||||
|
||||
it('should pin and unpin messages', async () => {
|
||||
let pinnedMessages = await service.getPinnedMessages()
|
||||
expect(pinnedMessages.length).toBe(0)
|
||||
|
||||
await service.pinMessage(TXT_CHAN_SERVICE_TESTING_MESSAGE_ID, "message")
|
||||
pinnedMessages = await service.getPinnedMessages()
|
||||
expect(pinnedMessages.length).toBe(1)
|
||||
|
||||
await service.unpinMessage(TXT_CHAN_SERVICE_TESTING_MESSAGE_ID)
|
||||
pinnedMessages = await service.getPinnedMessages()
|
||||
expect(pinnedMessages.length).toBe(0)
|
||||
});
|
||||
})
|
||||
@@ -1,50 +0,0 @@
|
||||
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"
|
||||
|
||||
const USER_SERVICE_TESTING_USER_ID = "000000000000000000000000"
|
||||
const USER_SERVICE_TESTING_TOKEN = "testingToken"
|
||||
|
||||
|
||||
describe("UserService Integration Testing", () => {
|
||||
const service = new UserService(USER_SERVICE_TESTING_USER_ID, USER_SERVICE_TESTING_TOKEN, new DatabaseMock())
|
||||
|
||||
it('should not throw on username change', async () => {
|
||||
await service.changeUsername("bob2")
|
||||
});
|
||||
|
||||
it('should not throw on displayName change', async () => {
|
||||
await service.changeDisplayName("New Display Name")
|
||||
});
|
||||
|
||||
it('should set new password', async () => {
|
||||
await service.changePassword("newPasswd", "") // The filler user doesn't have a password set yet
|
||||
});
|
||||
|
||||
it('should set new e-mail', async () => {
|
||||
const code = await service.changeEmail("bob2@example.com", "")
|
||||
expect(code).not.toBeNull()
|
||||
if (code != null) {
|
||||
await service.verifyEmailChange(code.codeCurr??0, code.codeNew??0, "bob2@example.com")
|
||||
}
|
||||
});
|
||||
|
||||
it('should upload a new pfp', async () => {
|
||||
const pfpId = await service.uploadNewPfpCdn(null, "A", <RGB>{r: 255, g: 255, b: 255})
|
||||
await service.uploadNewPfp(pfpId)
|
||||
});
|
||||
|
||||
it('should get sessions', async () => {
|
||||
const sessions = await service.getSessions()
|
||||
expect(sessions[0].token).toBe(USER_SERVICE_TESTING_TOKEN)
|
||||
});
|
||||
|
||||
it('should set new phone', async () => {
|
||||
const code = await service.changePhoneNumber("", "+36201234567")
|
||||
expect(code).not.toBeNull()
|
||||
if (code != null) {
|
||||
await service.verifyPhoneNumberChange("+36201234567", code.codeCurr??0, code.codeNew??0)
|
||||
}
|
||||
});
|
||||
})
|
||||
@@ -3,5 +3,9 @@ import {environment, SDKConfig} from "../src/core/environment";
|
||||
import {getClient} from "../src/core/http";
|
||||
|
||||
beforeEach(async () => {
|
||||
await getClient(false).post("v2/reset")
|
||||
environment.overwrite(<SDKConfig>{
|
||||
apiUrl: "http://localhost:3000"
|
||||
})
|
||||
|
||||
await getClient().post("v2/reset")
|
||||
})
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
import {describe, it} from "vitest";
|
||||
import {WebSocketHandler} from "../src/core/webSocketHandler";
|
||||
|
||||
const WEBSOCKET_HANDLER_TESTING_USER_ID = "000000000000000000000000"
|
||||
const WEBSOCKET_HANDLER_TESTING_USER_TOKEN = "testingToken"
|
||||
|
||||
describe("WebSocketHandler", () => {
|
||||
it("should connect", async () => {
|
||||
await WebSocketHandler.getInstance().connect(
|
||||
WEBSOCKET_HANDLER_TESTING_USER_ID,
|
||||
WEBSOCKET_HANDLER_TESTING_USER_TOKEN
|
||||
)
|
||||
})
|
||||
})
|
||||
@@ -4,7 +4,6 @@
|
||||
"module": "commonjs",
|
||||
"esModuleInterop": true,
|
||||
"forceConsistentCasingInFileNames": true,
|
||||
"declaration": true,
|
||||
"strict": true,
|
||||
"skipLibCheck": true,
|
||||
"outDir": "dist"
|
||||
|
||||
@@ -2,8 +2,6 @@ import { defineConfig } from 'vitest/config';
|
||||
|
||||
export default defineConfig({
|
||||
test: {
|
||||
maxWorkers: 1,
|
||||
minWorkers: 1,
|
||||
// Top-level configuration (global only)
|
||||
coverage: { provider: 'v8' },
|
||||
|
||||
|
||||
Reference in New Issue
Block a user