diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml deleted file mode 100644 index 202dd41..0000000 --- a/.github/workflows/docker-image.yml +++ /dev/null @@ -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 diff --git a/package-lock.json b/package-lock.json index 4c63a85..dad5de4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "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" diff --git a/package.json b/package.json index b786206..fa82b18 100644 --- a/package.json +++ b/package.json @@ -1,23 +1,22 @@ { "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" } diff --git a/server/main.js b/server/main.js index e5a69dd..30ddba1 100644 --- a/server/main.js +++ b/server/main.js @@ -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(", ")}`); });