Migrate to Fly.io

.dockerignore

@@ -0,0 +1 @@
+node_modules

.github/workflows/deploy.yml

@@ -0,0 +1,42 @@
+name: Deploy
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  deploy-gh-pages:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [16]
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: 'yarn'
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile
+      - name: Build
+        run: yarn workspace @kenrick95/c4-browser run build-gh-pages
+      - name: Deploy
+        uses: JamesIves/[email protected]
+        with:
+          branch: gh-pages
+          folder: app/dist 
+
+  deploy-fly:
+
+    runs-on: ubuntu-latest
+    env:
+      FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: superfly/flyctl-actions/setup-flyctl@master
+      - run: flyctl deploy --remote-only

.github/workflows/nodejs.yml → .github/workflows/test.yml

@@ -1,6 +1,3 @@
-# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
-
 name: Test
 
 on:
@@ -16,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [16]
 
     steps:
       - uses: actions/checkout@v3

Dockerfile

@@ -0,0 +1,16 @@
+FROM node:16-alpine
+WORKDIR /usr/src/app
+
+COPY .yarn .yarn/
+COPY .yarnrc.yml yarn.lock package.json ./
+COPY browser/package.json ./browser/
+COPY core/package.json ./core/
+COPY server/package.json ./server/
+
+
+RUN yarn install --frozen-lockfile
+COPY . .
+RUN yarn workspaces foreach --verbose --topological run build
+
+EXPOSE ${PORT}
+CMD [ "yarn", "workspace", "@kenrick95/c4-server", "start"]

browser/package.json

@@ -31,19 +31,19 @@
     "build": "yarn clean && parcel build src/index.html",
     "build-gh-pages": "yarn clean && parcel build src/index.html --public-url \"https://kenrick95.github.io/c4/dist/\"",
     "prettier": "prettier --write \"./**/*.?(ts|html|scss|css)\"",
-    "clean": "shx rm -rf dist/",
+    "clean": "rimraf dist/",
     "test": "echo 'OK'"
   },
   "dependencies": {
-    "@kenrick95/c4": "4.0.0",
+    "@kenrick95/c4": "workspace:^",
     "es6-promise": "^4.2.8",
     "url-search-params-polyfill": "^8.1.1"
   },
   "devDependencies": {
     "@types/node": "^16.9.6",
     "parcel-bundler": "^1.12.4",
     "prettier": "^2.4.1",
-    "shx": "^0.3.3",
+    "rimraf": "^3.0.2",
     "typescript": "^4.4.3"
   }
 }

browser/src/board/index.ts

@@ -1,6 +1,6 @@
-import { BoardBase, BoardPiece } from '@kenrick95/c4/src/board'
-import { Player } from '@kenrick95/c4/src/player'
-import { onresize, animationFrame } from '@kenrick95/c4/src/utils'
+import { BoardBase, BoardPiece } from '@kenrick95/c4'
+import { Player } from '@kenrick95/c4'
+import { onresize, animationFrame } from '@kenrick95/c4'
 import { drawMask, drawCircle, clearCanvas } from './utils'
 
 export class Board extends BoardBase {

browser/src/game/game-local-2p.ts

@@ -1,5 +1,5 @@
-import { BoardPiece } from '@kenrick95/c4/src/board'
-import { PlayerHuman } from '@kenrick95/c4/src/player'
+import { BoardPiece } from '@kenrick95/c4'
+import { PlayerHuman } from '@kenrick95/c4'
 import { GameLocal, initGameLocal } from './game-local'
 
 class GameLocal2p extends GameLocal {}

browser/src/game/game-local-ai.ts

@@ -1,5 +1,5 @@
-import { BoardPiece } from '@kenrick95/c4/src/board'
-import { PlayerAi } from '@kenrick95/c4/src/player'
+import { BoardPiece } from '@kenrick95/c4'
+import { PlayerAi } from '@kenrick95/c4'
 import { GameLocal, initGameLocal } from './game-local'
 
 class GameLocalAi extends GameLocal {}

browser/src/game/game-local.ts

@@ -1,12 +1,8 @@
 import { Board } from '../board'
-import { BoardBase, BoardPiece } from '@kenrick95/c4/src/board'
-import { GameBase } from '@kenrick95/c4/src/game'
-import { Player, PlayerHuman, PlayerAi } from '@kenrick95/c4/src/player'
-import {
-  showMessage,
-  animationFrame,
-  getColumnFromCoord,
-} from '@kenrick95/c4/src/utils'
+import { BoardBase, BoardPiece } from '@kenrick95/c4'
+import { GameBase } from '@kenrick95/c4'
+import { Player, PlayerHuman, PlayerAi } from '@kenrick95/c4'
+import { showMessage, animationFrame, getColumnFromCoord } from '@kenrick95/c4'
 
 const statusbox = document.querySelector('.statusbox')
 const statusboxBodyGame = document.querySelector('.statusbox-body-game')

browser/src/game/game-online-2p.ts

@@ -1,14 +1,14 @@
 import { Board } from '../board'
-import { BoardBase, BoardPiece } from '@kenrick95/c4/src/board'
+import { BoardBase, BoardPiece } from '@kenrick95/c4'
 import {
   GameBase,
   MESSAGE_TYPE,
   constructMessage,
   parseMessage,
   GameOnlineMessage,
-} from '@kenrick95/c4/src/game'
-import { Player, PlayerHuman, PlayerShadow } from '@kenrick95/c4/src/player'
-import { showMessage, getColumnFromCoord } from '@kenrick95/c4/src/utils'
+} from '@kenrick95/c4'
+import { Player, PlayerHuman, PlayerShadow } from '@kenrick95/c4'
+import { showMessage, getColumnFromCoord } from '@kenrick95/c4'
 
 enum GAME_MODE {
   FIRST = BoardPiece.PLAYER_1,
@@ -26,7 +26,7 @@ const C4_SERVER_ENDPOINT =
   process.env.NODE_ENV === 'production'
     ? process.env.C4_SERVER_ENDPOINT
       ? process.env.C4_SERVER_ENDPOINT
-      : `wss://c4-server.herokuapp.com/`
+      : `wss://c4-server.fly.dev/`
     : `ws://${location.hostname}:8080`
 
 export class GameOnline2p extends GameBase {

browser/tsconfig.json

@@ -12,6 +12,6 @@
     "target": "es5",
     "lib": ["es2015", "dom", "dom.iterable"]
   },
-  "include": ["src/", "@kenrick95/c4"],
+  "include": ["src/"],
   "exclude": ["node_modules", "**/*.spec.ts"]
 }

core/package.json

@@ -21,15 +21,16 @@
     "connect-four",
     "game"
   ],
-  "main": "./dist/lib.ts",
+  "main": "./dist/lib.js",
+  "types": "./src/lib.ts",
   "source": "./src/lib.ts",
   "files": [
     "src/",
     "dist/"
   ],
   "scripts": {
     "build": "yarn clean && parcel build ./src/lib.ts",
-    "clean": "shx rm -rf dist/",
+    "clean": "rimraf dist/",
     "prettier": "prettier --write \"./**/*.?(ts|html|scss|css)\"",
     "test": "jest"
   },
@@ -38,7 +39,7 @@
     "jest": "^27.2.1",
     "parcel-bundler": "^1.12.4",
     "prettier": "^2.4.1",
-    "shx": "^0.3.3",
+    "rimraf": "^3.0.2",
     "ts-jest": "^27.0.5",
     "typescript": "^4.4.3"
   }

deploy.md

@@ -1,21 +1,5 @@
 # Deployment notes
 
-## To GitHub Pages
-```
-git checkout gh-pages
-git merge master
-yarn
-yarn workspace @kenrick95/c4-browser run build-gh-pages
-rm index.html
-rm -rf dist/
-mv browser/dist/ dist/
-mv dist/index.html index.html
-```
-
-## To Heroku
-
-No action needed. Automatically deployed on master branch
-
 ## To npm
 
 Publishing [@kenrick95/c4](https://www.npmjs.com/package/@kenrick95/c4)

fly.toml

@@ -0,0 +1,42 @@
+# fly.toml file generated for c4-server on 2022-08-27T10:18:06+08:00
+
+app = "c4-server"
+kill_signal = "SIGINT"
+kill_timeout = 5
+processes = []
+
+[build]
+  dockerfile = "Dockerfile"
+
+[env]
+  PORT = "8080"
+
+[experimental]
+  allowed_public_ports = []
+  auto_rollback = true
+
+[[services]]
+  http_checks = []
+  internal_port = 8080
+  processes = ["app"]
+  protocol = "tcp"
+  script_checks = []
+  [services.concurrency]
+    hard_limit = 25
+    soft_limit = 20
+    type = "connections"
+
+  [[services.ports]]
+    force_https = true
+    handlers = ["http"]
+    port = 80
+
+  [[services.ports]]
+    handlers = ["tls", "http"]
+    port = 443
+
+  [[services.tcp_checks]]
+    grace_period = "1s"
+    interval = "15s"
+    restart_limit = 0
+    timeout = "2s"

package.json

@@ -22,7 +22,8 @@
     "url": "https://github.com/kenrick95/c4/issues"
   },
   "engines": {
-    "node": "^16"
+    "node": "16.x",
+    "yarn": "3.x"
   },
   "packageManager": "[email protected]",
   "homepage": "https://github.com/kenrick95/c4",
@@ -39,7 +40,7 @@
   "scripts": {
     "start": "concurrently --handle-input \"yarn:start-server\" \"yarn:start-browser\"",
     "start-browser": "yarn workspace @kenrick95/c4-browser start",
-    "start-server": "yarn workspace @kenrick95/c4-server start-dev"
+    "start-server": "yarn workspace @kenrick95/c4-server start-dev-watch"
   },
   "devDependencies": {
     "concurrently": "^6.2.1"

server/package.json

@@ -24,11 +24,14 @@
   "files": [
     "src/"
   ],
+  "main": "./dist/index.js",
   "source": "./src/index.ts",
   "scripts": {
-    "start": "ts-node src/index.ts",
-    "start-dev": "nodemon --watch src --ignore 'src/**/*.spec.ts' --exec yarn start",
-    "build": "echo 'OK'",
+    "start": "yarn node ./dist/index.js",
+    "start-dev": "ts-node src/index.ts",
+    "start-dev-watch": "nodemon --watch src --ignore 'src/**/*.spec.ts' --exec yarn start",
+    "build": "yarn clean && tsc --outDir dist/",
+    "clean": "rimraf dist/",
     "prettier": "prettier --write \"./**/*.?(ts|html|scss|css)\"",
     "test": "echo 'OK'"
   },
@@ -38,11 +41,12 @@
     "@types/ws": "^7.4.7",
     "nodemon": "^2.0.13",
     "prettier": "^2.4.1",
+    "rimraf": "^3.0.2",
     "ts-node": "^10.2.1",
     "typescript": "^4.4.3"
   },
   "dependencies": {
-    "@kenrick95/c4": "4.0.0",
+    "@kenrick95/c4": "workspace:^",
     "redux": "^4.1.1",
     "redux-thunk": "^2.3.0",
     "uuid": "^8.3.2",

server/src/actions.ts

@@ -1,11 +1,11 @@
 import { v4 as uuidV4 } from 'uuid'
 import { PlayerId, MatchId, RenewLastSeenAction, AppThunk } from './types'
 import * as WebSocket from 'ws'
-import { BoardBase, BoardPiece } from '@kenrick95/c4/src/board'
+import { BoardBase, BoardPiece } from '@kenrick95/c4'
 import {
   MESSAGE_TYPE,
   constructMessage,
-} from '@kenrick95/c4/src/game/game-online/shared'
+} from '@kenrick95/c4'
 
 export enum ACTION_TYPE {
   NEW_PLAYER_CONNECTION = 'NEW_PLAYER_CONNECTION',

server/src/game/board.ts

@@ -1,3 +1,3 @@
-import { BoardBase } from '@kenrick95/c4/src/board'
+import { BoardBase } from '@kenrick95/c4'
 
 export class ServerBoard extends BoardBase {}

server/src/game/game.ts

@@ -1,8 +1,8 @@
 import { ServerBoard } from './board'
-import { GameBase } from '@kenrick95/c4/src/game'
+import { GameBase } from '@kenrick95/c4'
 import { ServerPlayer } from './player'
 import { MatchId } from '../types'
-import { BoardPiece } from '@kenrick95/c4/src/board'
+import { BoardPiece } from '@kenrick95/c4'
 import { store } from '..'
 import { gameEnded } from '../actions'
 

server/src/game/player.ts

@@ -1,5 +1,5 @@
-import { BoardPiece } from '@kenrick95/c4/src/board'
-import { PlayerShadow } from '@kenrick95/c4/src/player'
+import { BoardPiece } from '@kenrick95/c4'
+import { PlayerShadow } from '@kenrick95/c4'
 import { PlayerId } from '../types'
 
 export class ServerPlayer extends PlayerShadow {

server/src/index.ts

@@ -18,7 +18,7 @@ import { MatchId, State, ActionTypes } from './types'
 import {
   MESSAGE_TYPE,
   parseMessage,
-} from '@kenrick95/c4/src/game/game-online/shared'
+} from '@kenrick95/c4'
 
 const port = parseInt(process.env.PORT || '') || 8080
 const wss = new WebSocket.Server({ port: port })

server/src/reducer.ts

@@ -1,6 +1,6 @@
 import { State, ActionTypes } from './types'
 import { ACTION_TYPE } from './actions'
-import { BoardPiece } from '@kenrick95/c4/src/board'
+import { BoardPiece } from '@kenrick95/c4'
 import { ServerGame } from './game/game'
 import { ServerPlayer } from './game/player'
 import { ServerBoard } from './game/board'

server/tsconfig.json

@@ -9,6 +9,6 @@
     "target": "es2017",
     "strict": true
   },
-  "include": ["@kenrick95/c4", "src/"],
+  "include": ["src/"],
   "exclude": ["node_modules", "**/*.spec.ts"]
 }