Skip to content

Commit

Permalink
Electron (#91)
Browse files Browse the repository at this point in the history
* add electron dep

* fix

* 1.0.4

* fixes

* 1.0.5

* bah

* bhkdsf

* fixes

* 1.0.6

* 1.0.7

* add back old versions

* use node 18

* maybe

* more

* more

* more

* more

* 1.0.8

* maybe

* maybe2

* 1.0.10

* cool

* 1.0.11

* 1.0.5 squish

* 1.0.12

* more

* 1.0.13

* lol

* 1.0.14

* remove electron dep

* cleanup

* cleanup

* more

* 1.0.15

* cleanup

* 1.0.16

* more

* what the heck

* use real squish versions

* back to default

* 1.0.18
  • Loading branch information
prosif authored Oct 6, 2023
1 parent 9f968c0 commit 1fe2228
Show file tree
Hide file tree
Showing 13 changed files with 234 additions and 376 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

strategy:
matrix:
node-version: [14.x]
node-version: [18.x]

steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Fetch image of node v14
FROM node:14
# Fetch image of node v18
FROM node:18

# Create app directory
WORKDIR /usr/src/app
Expand Down
17 changes: 14 additions & 3 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const server = require('./game_server');
const fs = require('fs');
const assert = require('assert');
const { reportBug } = require('./src/common/util');

const process = require('process');

Expand All @@ -13,7 +14,7 @@ if (baseDir.endsWith('src')) {

const linkHelper = require('./src/util/link-helper');

const { guaranteeCerts, guaranteeDir, log, authWorkflow, getConfigValue } = require('homegames-common');
const { guaranteeCerts, log, guaranteeDir, authWorkflow, getConfigValue } = require('homegames-common');

const LINK_ENABLED = getConfigValue('LINK_ENABLED', true);
const HTTPS_ENABLED = getConfigValue('HTTPS_ENABLED', false);
Expand Down Expand Up @@ -49,9 +50,19 @@ if (LINK_ENABLED) {
server(certPathArg, null, usernameArg);
}).catch(() => {
log.info('encountered error with link connection. starting server with link disabled');
server(certPathArg, null, usernameArg);
try {
server(certPathArg, null, usernameArg);
} catch (serverErr) {
console.error('Server error: ' + serverErr);
reportBug(`Error starting server: ${serverErr}`);
}
});
} else {
log.info('starting server with link disabled');
server(certPathArg, null, usernameArg);
try {
server(certPathArg, null, usernameArg);
} catch (serverErr) {
console.error('Server error: ' + serverErr);
reportBug(`Error starting server: ${serverErr}`);
}
}
Loading

0 comments on commit 1fe2228

Please sign in to comment.