Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
c08e921
Fix test case description formatting in raid.test.js
discoveredattack May 8, 2026
711d193
Bump mysql2 from 2.1.0 to 3.9.8 in /packages/junon-common
dependabot[bot] May 8, 2026
0c363b3
Merge pull request #1 from discoveredattack/dependabot/npm_and_yarn/p…
discoveredattack May 8, 2026
06fce4c
Bump ejs from 2.7.4 to 3.1.10
dependabot[bot] May 8, 2026
765e3be
Merge pull request #2 from discoveredattack/dependabot/npm_and_yarn/e…
discoveredattack May 8, 2026
7c7fbd5
Bump json5 from 2.2.1 to 2.2.3
dependabot[bot] May 8, 2026
272d1aa
Merge pull request #3 from discoveredattack/dependabot/npm_and_yarn/j…
discoveredattack May 8, 2026
488f96d
Bump ejs and gulp-ejs
dependabot[bot] May 9, 2026
3a6a1f7
Merge pull request #4 from discoveredattack/dependabot/npm_and_yarn/m…
discoveredattack May 9, 2026
5363a4d
Bump sequelize from 5.21.11 to 6.37.8 in /packages/junon-common
dependabot[bot] May 9, 2026
c1c8e82
Merge pull request #5 from discoveredattack/dependabot/npm_and_yarn/p…
discoveredattack May 9, 2026
453c067
Bump sequelize from 5.22.5 to 6.37.8
dependabot[bot] May 9, 2026
f94c096
Merge pull request #6 from discoveredattack/dependabot/npm_and_yarn/s…
discoveredattack May 9, 2026
835e380
Bump lodash from 4.17.21 to 4.18.1
dependabot[bot] May 9, 2026
12065d5
Merge pull request #7 from discoveredattack/dependabot/npm_and_yarn/l…
discoveredattack May 9, 2026
087f155
Bump protobufjs, firebase and firebase-admin
dependabot[bot] May 9, 2026
ccead6c
Merge pull request #8 from discoveredattack/dependabot/npm_and_yarn/m…
discoveredattack May 9, 2026
00d416b
Bump json-schema and jsprim in /packages/junon-common
dependabot[bot] May 9, 2026
2abf1f1
Merge pull request #9 from discoveredattack/dependabot/npm_and_yarn/p…
discoveredattack May 9, 2026
7e68a7b
Bump body-parser from 1.20.0 to 1.20.3
dependabot[bot] May 9, 2026
2f59a5e
Merge pull request #10 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 9, 2026
8e2fcba
Bump shell-quote and browserify
dependabot[bot] May 9, 2026
6f9837a
Merge pull request #11 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 9, 2026
a30ce7d
Bump pbkdf2 from 3.1.2 to 3.1.5
dependabot[bot] May 9, 2026
2441d30
Merge pull request #12 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 9, 2026
1a61a55
Bump @babel/traverse from 7.18.6 to 7.29.0
dependabot[bot] May 9, 2026
dbeaada
Merge pull request #13 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 10, 2026
bd48e89
Bump ws from 7.5.8 to 7.5.10
dependabot[bot] May 10, 2026
39e90de
Merge pull request #14 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 10, 2026
46fcdd3
Bump cipher-base from 1.0.4 to 1.0.7
dependabot[bot] May 10, 2026
aca98cb
Merge pull request #15 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 10, 2026
6796137
Bump open and reload
dependabot[bot] May 10, 2026
ff9a0a1
Merge pull request #16 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 10, 2026
bad4ce5
Bump minimatch from 3.0.4 to 3.1.5 in /packages/junon-common
dependabot[bot] May 10, 2026
167fc3c
Merge pull request #17 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 10, 2026
68dd648
Bump @babel/plugin-transform-modules-systemjs from 7.18.6 to 7.29.4
dependabot[bot] May 10, 2026
bd86b9c
Merge pull request #18 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 10, 2026
7e9bc64
Bump semver from 5.7.1 to 5.7.2 in /packages/junon-common
dependabot[bot] May 10, 2026
18b153a
Merge pull request #19 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 10, 2026
87e2caa
Bump semver and core-js-compat
dependabot[bot] May 10, 2026
f5be00a
Merge pull request #20 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 10, 2026
93c5875
Bump browserify-sign from 4.2.1 to 4.2.5
dependabot[bot] May 10, 2026
f4da9f6
Merge pull request #21 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 10, 2026
5a8fb9a
Bump path-to-regexp and express
dependabot[bot] May 11, 2026
6411afd
Merge pull request #22 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 11, 2026
b5a004b
Bump decode-uri-component from 0.2.0 to 0.2.2
dependabot[bot] May 11, 2026
ded03ab
Merge pull request #23 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 11, 2026
fa242ba
Bump y18n from 4.0.0 to 4.0.3 in /packages/junon-common
dependabot[bot] May 11, 2026
bdcb523
Merge pull request #24 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 11, 2026
6cc5bcb
Bump ini from 1.3.5 to 1.3.8 in /packages/junon-common
dependabot[bot] May 11, 2026
b0b2e66
Merge pull request #25 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 11, 2026
fddbd62
Bump js-yaml from 3.12.2 to 3.14.2 in /packages/junon-common
dependabot[bot] May 11, 2026
f7f74d9
Merge pull request #26 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 11, 2026
1e4f72d
Bump brace-expansion from 1.1.11 to 1.1.14 in /packages/junon-common
dependabot[bot] May 11, 2026
6d5727d
Merge pull request #27 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 11, 2026
49186a1
Bump brace-expansion from 1.1.11 to 1.1.14
dependabot[bot] May 11, 2026
de4bfb5
Merge pull request #28 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 11, 2026
cb48031
Bump @sentry/browser from 5.30.0 to 7.119.1
dependabot[bot] May 11, 2026
6c4b9d5
Merge pull request #29 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 11, 2026
620d9fe
Bump got and nodemon
dependabot[bot] May 11, 2026
189980c
Merge pull request #30 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 11, 2026
57572f3
Bump https-proxy-agent and @sentry/node in /packages/junon-common
dependabot[bot] May 11, 2026
cc526f5
Merge pull request #31 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 11, 2026
fedd565
Bump ajv from 6.10.0 to 6.15.0 in /packages/junon-common
dependabot[bot] May 11, 2026
bb104fd
Merge pull request #32 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 11, 2026
f23fa16
Bump path-parse from 1.0.6 to 1.0.7 in /packages/junon-common
dependabot[bot] May 11, 2026
d536a2d
Merge pull request #33 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 11, 2026
168b6aa
Bump xml2js and aws-sdk
dependabot[bot] May 11, 2026
ec70625
Merge pull request #34 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 11, 2026
f2401c0
replace old dependency 'request'(and its uses) with axios
Pabedety May 11, 2026
d8ed28c
what went wrong here
Pabedety May 11, 2026
0921085
Bump es5-ext from 0.10.53 to 0.10.64 in /packages/junon-common
dependabot[bot] May 12, 2026
88c4d9b
Merge pull request #36 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 12, 2026
cc273f8
Bump picomatch from 2.3.1 to 2.3.2
dependabot[bot] May 12, 2026
6b7fd3e
Bump cookie and @sentry/node in /packages/junon-common
dependabot[bot] May 12, 2026
b9e3df0
Merge pull request #37 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 12, 2026
15ea5de
Merge pull request #35 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 12, 2026
4a37350
ran npm install. "lockfile outdated" error msg should be gone
Pabedety May 13, 2026
6caf55c
once again this should be good enough. genuinely added tough-cookie v…
Pabedety May 13, 2026
745018b
Update tough-cookie to 4.1.3
discoveredattack May 13, 2026
dcda46e
Revert "Update tough-cookie to 4.1.3"
discoveredattack May 13, 2026
8a4b763
update gulp-jshint to 2.1. co-install jshint 2.13.6. update lodash to…
Pabedety May 14, 2026
20265dd
updated gulp-connect to 5.7 and morgan to 1.10
Pabedety May 14, 2026
a696fd1
Bump ws from 7.5.10 to 8.17.1
dependabot[bot] May 14, 2026
6731842
Merge pull request #38 from discoveredattack/dependabot/npm_and_yarn/…
discoveredattack May 14, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20,531 changes: 10,168 additions & 10,363 deletions package-lock.json

Large diffs are not rendered by default.

9 changes: 8 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@
},
"dependencies": {
"perlin-noise": "^0.0.1",
"sharp": "^0.33.1"
"sharp": "^0.33.1",
"tough-cookie": "^4.1.3"
},
"devDependencies": {
"gulp-connect": "^5.7.0",
"gulp-jshint": "^2.1.0",
"jshint": "^2.13.6",
"lodash": "^4.18.1"
}
}
4,539 changes: 1,997 additions & 2,542 deletions packages/junon-common/package-lock.json

Large diffs are not rendered by default.

16 changes: 9 additions & 7 deletions packages/junon-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,17 @@
"db:setup": "sequelize db:create && sequelize db:migrate"
},
"dependencies": {
"@sentry/node": "^5.3.0",

"@sentry/node": "^10.52.0",
"axios": "^1.16.0",

"base64id": "^1.0.0",
"js-yaml": "^3.12.2",
"js-yaml": "^3.14.2",
"json-stream": "^1.0.0",
"lodash": "^4.17.4",
"mysql2": "^2.1.0",
"protobufjs": "^6.7.3",
"request": "^2.88.0",
"sequelize": "^5.21.11",
"lodash": "^4.18.1",
"mysql2": "^3.9.8",
"protobufjs": "^8.0.3",
"sequelize": "^6.37.8",
"sequelize-cli": "^5.5.1",
"winston": "^2.3.1"
},
Expand Down
32 changes: 16 additions & 16 deletions packages/junon-io/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,28 @@
"author": "",
"license": "ISC",
"dependencies": {
"@sentry/node": "^5.3.0",
"@dagrejs/graphlib": "^2.1.4",
"@fingerprintjs/fingerprintjs": "^3.0.1",
"aws-sdk": "^2.562.0",
"@sentry/node": "^5.3.0",
"aws-sdk": "^2.1693.0",
"base64id": "^1.0.0",
"body-parser": "^1.19.0",
"body-parser": "^1.20.3",
"chrome-remote-interface": "0.27.1",
"cors": "^2.8.5",
"eventbusjs": "^0.2.0",
"express": "^4.11.1",
"express": "^4.22.1",
"faker": "^4.1.0",
"firebase": "^7.15.5",
"firebase-admin": "^8.2.0",
"firebase": "^12.13.0",
"firebase-admin": "^13.9.0",
"get-port": "^5.0.0",
"junon-common": "*",
"lodash": "^4.17.4",
"lodash": "^4.18.1",
"minipass": "2.7.0",
"mysql": "^2.18.1",
"node-polyglot": "^2.4.0",
"p2": "^0.7.1",
"prom-client": "^11.5.3",
"protobufjs": "^6.10.2",
"protobufjs": "^8.0.3",
"rbush": "^2.0.1",
"sat": "^0.7.1",
"sharp": "0.34.5",
Expand All @@ -44,29 +44,29 @@
"uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.64.0",
"winston": "^2.3.1",
"winston-daily-rotate-file": "^1.4.6",
"ws": "^7.1.1",
"ws": "^8.17.1",
"xss": "^1.0.8"
},
"devDependencies": {
"@babel/cli": "^7.2.3",
"@babel/plugin-transform-runtime": "^7.4.4",
"@babel/preset-env": "^7.2.3",
"@sentry/browser": "^5.3.0",
"@sentry/browser": "^7.119.1",
"@sentry/cli": "^1.41.2",
"@shopify/draggable": "^1.0.0-beta.8",
"@tweenjs/tween.js": "^17.2.0",
"babel-core": "^7.0.0-bridge.0",
"bowser": "^2.4.0",
"browserify": "^8.1.0",
"ejs": "^2.5.6",
"browserify": "^17.0.1",
"ejs": "^3.1.10",
"element-closest": "^3.0.1",
"gemini-scrollbar": "^1.5.3",
"gulp": "4.0.2",
"gulp-babel": "^8.0.0",
"gulp-clean": "^0.4.0",
"gulp-concat": "^2.6.1",
"gulp-connect": "^2.2.0",
"gulp-ejs": "^3.3.0",
"gulp-connect": "^5.7.0",
"gulp-ejs": "^5.1.0",
"gulp-if": "^2.0.2",
"gulp-jshint": "^1.9.0",
"gulp-rename": "^1.2.2",
Expand All @@ -84,11 +84,11 @@
"merge-stream": "^1.0.1",
"natives": "^1.1.6",
"nipplejs": "github:simpleyuji/nipplejs#master",
"nodemon": "^1.18.9",
"nodemon": "^3.1.14",
"perfect-scrollbar": "^1.4.0",
"pixi.js": "^4.8.5",
"pump": "^3.0.0",
"reload": "^1.1.5",
"reload": "^3.4.3",
"terser": "^4.8.0",
"through2": "^3.0.0",
"tinycolor2": "^1.4.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/junon-io/test/ai/raid.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ describe('when target structure is inside homearea room', () => {
})
})

test('7 neighbor rooms. none is unclaimed => {
test('7 neighbor rooms. none is unclaimed', () => {
expect(true).toEqual(true)
})

Expand Down
37 changes: 15 additions & 22 deletions packages/junon-io/test/load_testing/player_join_stress.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,32 @@ global.debugMode = env === 'development' ? true : false
const PlayerBot = require("./../bots/player_bot")
const Config = require("junon-common/config")
const LOG = require("junon-common/logger")
const request = require("request")
const axios = require("axios")
global.allBots = []

const sleep = (ms) => {
return new Promise(resolve => setTimeout(resolve, ms))
}
const response = await axios.get(url)
const body = response.data //the amount of faith i am putting on my knowledge of axios

const region = env === 'development' ? 'localhost' : 'nyc1'

const getGameServersList = () => {
let matchmakerServersUrl = Config[env].matchmakerUrl + "server_status"

return new Promise((resolve, reject) => {
request({
method: 'get',
url: matchmakerServersUrl,
json: true
}, (err, res, body) => {
if (err) {
console.log("unable to get gameServer list..")
resolve({})
} else {
let data = body
if (data.error) {
console.log(data.error)
return
}

resolve(data)
return axios.get(matchmakerServersUrl)
.then((response) => {
let data = response.data
if (data.error) {
console.log(data.error)
return {}
}
return data
})
.catch((err) => {
console.log("unable to get gameServer list..")
return {}
})
})
}
//axios is either very nice or I'm too oblivious to see bugs here

const createBots = async (count) => {
let botCount = count
Expand Down
33 changes: 16 additions & 17 deletions packages/junon-io/test/load_testing/send_to_server.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
const request = require('request')
const axios = require('axios');

const sendToServer = (message, queryOptions) => {
let payload = {
url: "http://localhost:8000/debug/" + message
}
let config = {
url: "http://localhost:8000/debug/" + message,
method: 'get'
};

if (queryOptions) {
payload.qs = queryOptions
config.params = queryOptions;
}

return new Promise((resolve, reject) => {
request.get(payload, (err, res, body) => {
if (err) {
console.log(err)
reject(err)
} else {
resolve(JSON.parse(body).result)
}
return axios(config)
.then((response) => {
return response.data.result;
})
})
}

module.exports = sendToServer
.catch((err) => {
console.log(err);
throw err;
});
};
//i am not too sure about how axios works
module.exports = sendToServer;
14 changes: 7 additions & 7 deletions packages/junon-matchmaker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@
"author": "",
"license": "ISC",
"dependencies": {
"junon-common": "*",
"@sentry/node": "^4.3.4",
"aws-sdk": "^2.229.1",
"aws-sdk": "^2.1693.0",
"axios": "^1.16.0",
"cors": "^2.8.5",
"express": "^4.11.1",
"firebase-admin": "^8.2.0",
"express": "^4.22.1",
"firebase-admin": "^13.9.0",
"js-yaml": "^3.12.2",
"json-stream": "^1.0.0",
"lodash": "^4.17.4",
"junon-common": "*",
"lodash": "^4.18.1",
"morgan": "^1.9.0",
"request": "^2.88.0",
"uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.10.0"
},
"devDependencies": {
"nodemon": "^1.18.9"
"nodemon": "^3.1.14"
},
"repository": {
"type": "git",
Expand Down