WIP: Testing WS
This commit is contained in:
parent
3435f92fcb
commit
16b7c1708b
@ -8,7 +8,7 @@
|
||||
"dev:stop": "docker-compose -f docker-compose-dev.yaml down",
|
||||
"dev:logs": "docker-compose -f docker-compose-dev.yaml logs -f --tail 10",
|
||||
"studio": "npx prisma studio",
|
||||
"start": "npx prisma migrate deploy && npx prisma generate && npx prisma db seed && node build/index.js",
|
||||
"start": "npx prisma migrate deploy && npx prisma generate && npx prisma db seed && node server/index.js",
|
||||
"build": "svelte-kit build",
|
||||
"preview": "svelte-kit preview",
|
||||
"check": "svelte-check --tsconfig ./tsconfig.json",
|
||||
@ -66,6 +66,7 @@
|
||||
"@iarna/toml": "2.2.5",
|
||||
"@prisma/client": "3.11.1",
|
||||
"@sentry/node": "6.19.7",
|
||||
"@types/express": "4.17.13",
|
||||
"bcryptjs": "2.4.3",
|
||||
"bullmq": "1.81.4",
|
||||
"compare-versions": "4.1.3",
|
||||
@ -74,6 +75,7 @@
|
||||
"dayjs": "1.11.2",
|
||||
"dockerode": "3.3.1",
|
||||
"dotenv-extended": "2.9.0",
|
||||
"express": "^4.18.1",
|
||||
"generate-password": "1.7.0",
|
||||
"get-port": "6.1.2",
|
||||
"got": "12.0.4",
|
||||
@ -85,6 +87,8 @@
|
||||
"node-forge": "1.3.1",
|
||||
"node-os-utils": "1.3.6",
|
||||
"p-limit": "4.0.0",
|
||||
"socket.io": "4.5.0",
|
||||
"socket.io-client": "4.5.0",
|
||||
"svelte-kit-cookie-session": "2.1.4",
|
||||
"tailwindcss-scrollbar": "0.1.0",
|
||||
"unique-names-generator": "4.7.1"
|
||||
|
732
pnpm-lock.yaml
generated
732
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
20
server/index.js
Normal file
20
server/index.js
Normal file
@ -0,0 +1,20 @@
|
||||
import express from 'express';
|
||||
import { createServer } from 'http';
|
||||
import { Server } from 'socket.io';
|
||||
|
||||
import { handler } from '../build/handler.js';
|
||||
|
||||
const app = express();
|
||||
const server = createServer(app);
|
||||
|
||||
const io = new Server(server);
|
||||
|
||||
io.on('connection', (socket) => {
|
||||
socket.emit('eventFromServer', 'Hello, World 👋');
|
||||
});
|
||||
|
||||
app.use(handler);
|
||||
|
||||
server.listen(port, () => {
|
||||
console.log(`Listening on port ${port}`);
|
||||
});
|
@ -96,12 +96,16 @@ export const getUserDetails = async (
|
||||
const userId = event?.locals?.session?.data?.userId || null;
|
||||
let permission = 'read';
|
||||
if (teamId && userId) {
|
||||
const data = await db.prisma.permission.findFirst({
|
||||
where: { teamId, userId },
|
||||
select: { permission: true },
|
||||
rejectOnNotFound: true
|
||||
});
|
||||
if (data.permission) permission = data.permission;
|
||||
try {
|
||||
const data = await db.prisma.permission.findFirst({
|
||||
where: { teamId, userId },
|
||||
select: { permission: true },
|
||||
rejectOnNotFound: true
|
||||
});
|
||||
if (data.permission) permission = data.permission;
|
||||
} catch (error) {
|
||||
console.log(error);
|
||||
}
|
||||
}
|
||||
|
||||
const payload = {
|
||||
|
3
src/lib/realtime.ts
Normal file
3
src/lib/realtime.ts
Normal file
@ -0,0 +1,3 @@
|
||||
import ioClient from 'socket.io-client';
|
||||
const socket = ioClient('http://localhost:3000');
|
||||
export const io = socket;
|
@ -43,6 +43,7 @@
|
||||
import { del, get, post } from '$lib/api';
|
||||
import { dev } from '$app/env';
|
||||
import { features } from '$lib/store';
|
||||
import { io } from '$lib/realtime';
|
||||
let isUpdateAvailable = false;
|
||||
|
||||
let updateStatus = {
|
||||
@ -51,6 +52,11 @@
|
||||
success: null
|
||||
};
|
||||
let latestVersion = 'latest';
|
||||
|
||||
io.on('eventFromServer', (message) => {
|
||||
console.log(message);
|
||||
});
|
||||
|
||||
onMount(async () => {
|
||||
if ($session.userId) {
|
||||
const overrideVersion = $features.latestVersion;
|
||||
|
@ -23,7 +23,6 @@
|
||||
import { t } from '$lib/translations';
|
||||
import { get } from '$lib/api';
|
||||
import { onDestroy, onMount } from 'svelte';
|
||||
import Loading from './applications/[id]/logs/_Loading.svelte';
|
||||
import Trend from './_Trend.svelte';
|
||||
import { session } from '$app/stores';
|
||||
|
||||
|
@ -1,6 +1,17 @@
|
||||
import preprocess from 'svelte-preprocess';
|
||||
import adapter from '@sveltejs/adapter-node';
|
||||
|
||||
import { Server } from 'socket.io';
|
||||
const webSocketServer = {
|
||||
name: 'webSocketServer',
|
||||
configureServer(server) {
|
||||
const io = new Server(server.httpServer);
|
||||
io.on('connection', (socket) => {
|
||||
socket.emit('eventFromServer', 'Hello, World 👋');
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
const config = {
|
||||
preprocess: preprocess(),
|
||||
kit: {
|
||||
@ -10,6 +21,7 @@ const config = {
|
||||
},
|
||||
floc: true,
|
||||
vite: {
|
||||
plugins: [webSocketServer],
|
||||
optimizeDeps: {
|
||||
exclude: ['svelte-kit-cookie-session']
|
||||
},
|
||||
|
Loading…
x
Reference in New Issue
Block a user