diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6c34628..a30b7ff 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,9 +3,6 @@ on: push: branches: - master - pull_request: - branches: - - master concurrency: deploy jobs: deploy: diff --git a/backend/api.js b/backend/api.js index da18dee..9b63574 100644 --- a/backend/api.js +++ b/backend/api.js @@ -309,7 +309,7 @@ export class Session { code = createEmpty !== undefined ? createEmpty : template + "\n"; } if (code && suffix) { - code += suffix + "\n"; + code += "\n" + suffix + "\n"; } await this.writeCode(code); const termArgs = this.privilegedPty(cmdline); diff --git a/financials/2021-09/breakdown.txt b/financials/2021-09/breakdown.txt new file mode 100644 index 0000000..a767444 --- /dev/null +++ b/financials/2021-09/breakdown.txt @@ -0,0 +1,27 @@ +Riju :: $81.55 + EC2 :: $57.02 + Data Transfer :: $0.02 + EBS Snapshot :: $1.97 + EBS Volume :: $26.82 + EBS Volume :: $26.82 + gp2 :: $1.01 + gp3 :: $25.81 + Instance :: $28.21 + t3.medium :: $19.01 + t3.small :: $9.21 + ECR :: $5.09 + Storage :: $5.09 + ELB :: $19.32 + Data Transfer :: $0.22 + LCUs :: $0.06 + Load Balancer :: $19.04 + S3 :: $0.12 + +COMMENTARY: We're starting to look pretty stable from month to month. +Naturally the costs are higher because we were operating the +infrastructure for the entire month this time, instead of being down +for half of it, but I think this cost is about what we should expect +to see going forward until changes are made. + +I did realize, by the way, that we can't use Lambda to replace the +ELB, because that wouldn't support websockets. Oh well. diff --git a/frontend/src/app.js b/frontend/src/app.js index 56bbd78..1aa5a23 100644 --- a/frontend/src/app.js +++ b/frontend/src/app.js @@ -180,6 +180,11 @@ async function main() { break; } return; + case "langConfig": + // We could use this message instead of hardcoding the + // language config into the HTML page returned from the + // server, but for now we just ignore it. + return; default: console.error("Unexpected message from server:", message); return; diff --git a/langs/java.yaml b/langs/java.yaml index 2fa2725..98ba3a0 100644 --- a/langs/java.yaml +++ b/langs/java.yaml @@ -14,7 +14,7 @@ install: wget https://download.eclipse.org/jdtls/snapshots/jdt-language-server-latest.tar.gz tar -xf jdt-language-server-latest.tar.gz -C "${pkg}/opt/jdt" -main: "Main.java" +main: "src/Main.java" template: | public class Main { public static void main(String[] args) { @@ -23,9 +23,9 @@ template: | } compile: | - javac Main.java + javac src/Main.java run: | - java Main + java -cp src Main format: run: | @@ -41,9 +41,9 @@ format: lsp: setup: | - rm -rf jdt && cp -RT /opt/jdt/config_linux jdt + rm -rf "$HOME/jdt-config" && cp -RT /opt/jdt/config_linux "$HOME/jdt-config" start: | - java -Declipse.application=org.eclipse.jdt.ls.core.id1 -Dosgi.bundles.defaultStartLevel=4 -Declipse.product=org.eclipse.jdt.ls.core.product -Dlog.level=ALL -noverify -Xmx1G -jar /opt/jdt/plugins/org.eclipse.equinox.launcher_*.jar -configuration "$PWD/jdt" -data "$PWD" --add-modules=ALL-SYSTEM --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED + java -Declipse.application=org.eclipse.jdt.ls.core.id1 -Dosgi.bundles.defaultStartLevel=4 -Declipse.product=org.eclipse.jdt.ls.core.product -Dlog.level=ALL -noverify -Xmx1G -jar /opt/jdt/plugins/org.eclipse.equinox.launcher_*.jar -configuration "$HOME/jdt-config" -data "$HOME/jdt-data" --add-modules=ALL-SYSTEM --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED init: settings: java: diff --git a/yarn.lock b/yarn.lock index 50aa20f..39039a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1164,9 +1164,9 @@ ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5: uri-js "^4.2.2" ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== ansi-styles@^3.2.1: version "3.2.1"