Compare commits
No commits in common. "main" and "v1.1.0" have entirely different histories.
7 changed files with 21 additions and 48 deletions
25
.github/workflows/docker-image.yml
vendored
25
.github/workflows/docker-image.yml
vendored
|
@ -1,25 +0,0 @@
|
|||
name: Docker CI
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ "main" ]
|
||||
pull_request:
|
||||
branches: [ "main" ]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
-
|
||||
name: Login to Docker Registry
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: docker.arimelody.me
|
||||
username: ${{ secrets.DOCKER_USER }}
|
||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||
-
|
||||
name: Build and push
|
||||
uses: docker/build-push-action@v6
|
||||
with:
|
||||
push: true
|
||||
tags: docker.arimelody.me/openterminal:latest
|
|
@ -2,7 +2,7 @@ version: "3.9"
|
|||
services:
|
||||
web:
|
||||
build: .
|
||||
image: docker.arimelody.me/openterminal
|
||||
image: openterminal
|
||||
container_name: openterminal
|
||||
ports:
|
||||
- 8080:8080
|
||||
|
|
19
package-lock.json
generated
19
package-lock.json
generated
|
@ -1,22 +1,21 @@
|
|||
{
|
||||
"name": "openterminal",
|
||||
"version": "1.1.0",
|
||||
"version": "1.0.0",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "openterminal",
|
||||
"version": "1.1.0",
|
||||
"version": "1.0.0",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"ws": "^8.17.1"
|
||||
"ws": "^8.14.2"
|
||||
}
|
||||
},
|
||||
"node_modules/ws": {
|
||||
"version": "8.17.1",
|
||||
"resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
|
||||
"integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
|
||||
"license": "MIT",
|
||||
"version": "8.14.2",
|
||||
"resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
|
||||
"integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
|
||||
"engines": {
|
||||
"node": ">=10.0.0"
|
||||
},
|
||||
|
@ -36,9 +35,9 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"ws": {
|
||||
"version": "8.17.1",
|
||||
"resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
|
||||
"integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
|
||||
"version": "8.14.2",
|
||||
"resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
|
||||
"integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
|
||||
"requires": {}
|
||||
}
|
||||
}
|
||||
|
|
11
package.json
11
package.json
|
@ -1,24 +1,23 @@
|
|||
{
|
||||
"name": "openterminal",
|
||||
"version": "1.1.0",
|
||||
"version": "1.0.0",
|
||||
"description": "",
|
||||
"main": "./server/main.js",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"start": "node ./server/main.js",
|
||||
"dev": "nodemon ./server/main.js"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/arimelody/openterminal.git"
|
||||
"url": "git+https://github.com/mellodoot/openterminal.git"
|
||||
},
|
||||
"author": "ari melody",
|
||||
"license": "ISC",
|
||||
"bugs": {
|
||||
"url": "https://github.com/arimelody/openterminal/issues"
|
||||
"url": "https://github.com/mellodoot/openterminal/issues"
|
||||
},
|
||||
"homepage": "https://github.com/arimelody/openterminal#readme",
|
||||
"homepage": "https://github.com/mellodoot/openterminal#readme",
|
||||
"dependencies": {
|
||||
"ws": "^8.17.1"
|
||||
"ws": "^8.14.2"
|
||||
}
|
||||
}
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 25 KiB |
Binary file not shown.
|
@ -1,7 +1,7 @@
|
|||
import fs from 'fs';
|
||||
import http from 'http';
|
||||
import path from 'path';
|
||||
import WebSocket from 'ws';
|
||||
const fs = require('fs');
|
||||
const http = require('http');
|
||||
const path = require('path');
|
||||
const Websocket = require('ws');
|
||||
|
||||
const VERSION = "1.1.0";
|
||||
|
||||
|
@ -136,7 +136,7 @@ function get_real_address(req) {
|
|||
return req.connection.remoteAddress;
|
||||
}
|
||||
|
||||
const wss = new WebSocket.Server({ server });
|
||||
const wss = new Websocket.Server({ server });
|
||||
wss.on('connection', (socket, req) => {
|
||||
console.log(`${new Date().toISOString()} - WS OPEN - ${get_real_address(req)} (active connections: ${sockets.length + 1})`);
|
||||
/*
|
||||
|
@ -271,7 +271,7 @@ function generate_colour() {
|
|||
}
|
||||
|
||||
server.listen(PORT, HOST, () => {
|
||||
console.log(`OpenTerminal is now LIVE on http://${HOST}:${PORT}`);
|
||||
console.log(`OpenTerminal is now LIVE on http://${HOST === '0.0.0.0' ? '127.0.0.1' : HOST}:${PORT}`);
|
||||
if (TRUSTED_PROXIES.length > 0) console.log(`Using X-Forwarded-For headers for hosts: ${TRUSTED_PROXIES.join(", ")}`);
|
||||
});
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue