Skip to content

Commit 19e8c5d

Browse files
deps: upgrade packages (#31)
* deps: upgrade sharedb package * deps: upgrade koa packages as well * deps: add ws due to peer deps * fix: disable timeout due to nodejs bug
1 parent f6c5883 commit 19e8c5d

File tree

3 files changed

+45
-48
lines changed

3 files changed

+45
-48
lines changed

index.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,21 @@ app.use(async (ctx) => {
8282
console.log(err);
8383
break;
8484
default:
85-
console.error('Unexpected error:')
85+
console.error('Unexpected error:');
8686
console.error(err);
8787
break;
8888
}
89-
})
89+
});
9090
db.listen(ws, { docId, readOnly }); // docId and readOnly is passed to 'connect' middleware as ctx.req
9191
} else {
9292
ctx.body = { docId, readOnly };
9393
}
9494
});
9595

96-
app.listen(process.env.PORT || 8080);
96+
const server = app.listen(process.env.PORT || 8080);
97+
// Reference: https://github.com/b3nsn0w/koa-easy-ws/issues/36
98+
server.requestTimeout = 0;
99+
server.headersTimeout = 0;
97100

98101
function getSessionDetails(sessionId) {
99102
const sessionDetails = documents.get(sessionId);

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515
"@koa/cors": "^5.0.0",
1616
"@teamwork/websocket-json-stream": "^2.0.0",
1717
"koa": "^2.15.4",
18-
"koa-bodyparser": "^4.3.0",
19-
"koa-easy-ws": "^1.2.0",
20-
"sharedb": "^1.4.1",
21-
"uuid": "^8.3.0"
18+
"koa-bodyparser": "^4.4.1",
19+
"koa-easy-ws": "^2.1.0",
20+
"sharedb": "^5.1.1",
21+
"uuid": "^11.1.0",
22+
"ws": "^8.18.0"
2223
},
2324
"devDependencies": {
2425
"eslint": "^7.6.0",

yarn.lock

Lines changed: 34 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -115,22 +115,20 @@ argparse@^1.0.7:
115115
dependencies:
116116
sprintf-js "~1.0.2"
117117

118-
arraydiff@^0.1.1:
118+
arraydiff@^0.1.3:
119119
version "0.1.3"
120120
resolved "https://registry.yarnpkg.com/arraydiff/-/arraydiff-0.1.3.tgz#86a5436d7b72f1bdda5fd6d74e8724e42f83ce4d"
121-
integrity sha1-hqVDbXty8b3aX9bXTock5C+Dzk0=
121+
integrity sha512-t0OgO06uolEcMUvV8+yHc9Pc9pazh8wi/Dtyok/sQwvcr8iFV+P86IfAzK7upUDhI4oavhVREMY7iSWtm38LeA==
122122

123123
astral-regex@^1.0.0:
124124
version "1.0.0"
125125
resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
126126
integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
127127

128-
async@^2.6.3:
129-
version "2.6.4"
130-
resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
131-
integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
132-
dependencies:
133-
lodash "^4.17.14"
128+
async@^3.2.4:
129+
version "3.2.6"
130+
resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
131+
integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==
134132

135133
balanced-match@^1.0.0:
136134
version "1.0.0"
@@ -463,12 +461,7 @@ esutils@^2.0.2:
463461
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
464462
integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
465463

466-
fast-deep-equal@^2.0.1:
467-
version "2.0.1"
468-
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
469-
integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
470-
471-
fast-deep-equal@^3.1.1:
464+
fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
472465
version "3.1.3"
473466
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
474467
integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
@@ -736,13 +729,14 @@ keygrip@~1.1.0:
736729
dependencies:
737730
tsscmp "1.0.6"
738731

739-
koa-bodyparser@^4.3.0:
740-
version "4.3.0"
741-
resolved "https://registry.yarnpkg.com/koa-bodyparser/-/koa-bodyparser-4.3.0.tgz#274c778555ff48fa221ee7f36a9fbdbace22759a"
742-
integrity sha512-uyV8G29KAGwZc4q/0WUAjH+Tsmuv9ImfBUF2oZVyZtaeo0husInagyn/JH85xMSxM0hEk/mbCII5ubLDuqW/Rw==
732+
koa-bodyparser@^4.4.1:
733+
version "4.4.1"
734+
resolved "https://registry.yarnpkg.com/koa-bodyparser/-/koa-bodyparser-4.4.1.tgz#a908d848e142cc57d9eece478e932bf00dce3029"
735+
integrity sha512-kBH3IYPMb+iAXnrxIhXnW+gXV8OTzCu8VPDqvcDHW9SQrbkHmqPQtiZwrltNmSq6/lpipHnT7k7PsjlVD7kK0w==
743736
dependencies:
744737
co-body "^6.0.0"
745738
copy-to "^2.0.1"
739+
type-is "^1.6.18"
746740

747741
koa-compose@^4.1.0:
748742
version "4.1.0"
@@ -757,13 +751,12 @@ koa-convert@^2.0.0:
757751
co "^4.6.0"
758752
koa-compose "^4.1.0"
759753

760-
koa-easy-ws@^1.2.0:
761-
version "1.3.0"
762-
resolved "https://registry.yarnpkg.com/koa-easy-ws/-/koa-easy-ws-1.3.0.tgz#dbf8eeb126ca11eed4c4e3af7904a47c25be2347"
763-
integrity sha512-06lHAwm25HBdplTpwHiZqKcl39vS4KiVzRPneUExCHVvQ9TPHmFlUFO/gjQrUdLj3+kvqQpqdlIPNb91wn6EwA==
754+
koa-easy-ws@^2.1.0:
755+
version "2.1.0"
756+
resolved "https://registry.yarnpkg.com/koa-easy-ws/-/koa-easy-ws-2.1.0.tgz#31e1ee1072fd1a72ffdc59706a0e54bc023e20ee"
757+
integrity sha512-SF6RHIuHttkt9RdACWPRFlSOHPcVS87otBfChLx83vmB1en8uODmE5G1thuKd0qUPRZU8FvFHJXWIxf7ib9J1w==
764758
dependencies:
765759
debug "^4.1.1"
766-
ws "^7.3.1"
767760

768761
koa@^2.15.4:
769762
version "2.15.4"
@@ -901,7 +894,7 @@ optionator@^0.9.1:
901894
type-check "^0.4.0"
902895
word-wrap "^1.2.3"
903896

904-
ot-json0@^1.0.1:
897+
ot-json0@^1.1.0:
905898
version "1.1.0"
906899
resolved "https://registry.yarnpkg.com/ot-json0/-/ot-json0-1.1.0.tgz#f5edeff162673b62f0f136bb64724c40ac5e590d"
907900
integrity sha512-wf5fci7GGpMYRDnbbdIFQymvhsbFACMHtxjivQo5KgvAHlxekyfJ9aPsRr6YfFQthQkk4bmsl5yESrZwC/oMYQ==
@@ -1019,16 +1012,16 @@ setprototypeof@1.2.0:
10191012
resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
10201013
integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
10211014

1022-
sharedb@^1.4.1:
1023-
version "1.4.1"
1024-
resolved "https://registry.yarnpkg.com/sharedb/-/sharedb-1.4.1.tgz#f40c806a9713857efaefc7dc990b8f2de1a0c703"
1025-
integrity sha512-SwsEgVKMtHfJgWe6W8CoDRATg1auJNOal0XttvteylzNaJwM/jMycuQuB5vxFWLBRirWgQip6KuSOi+5s8ncgQ==
1015+
sharedb@^5.1.1:
1016+
version "5.1.1"
1017+
resolved "https://registry.yarnpkg.com/sharedb/-/sharedb-5.1.1.tgz#d1013cbc25e11be8d5a5c0e469a4b7242eeccdf6"
1018+
integrity sha512-qNiO2nJdvnQYRvKMiZzbPyyXuBN0uulP4VaFrybJRLVSif8XPEnNO7Up/aHO3nwA5UejizzncOL8KVba4Rj4KA==
10261019
dependencies:
1027-
arraydiff "^0.1.1"
1028-
async "^2.6.3"
1029-
fast-deep-equal "^2.0.1"
1020+
arraydiff "^0.1.3"
1021+
async "^3.2.4"
1022+
fast-deep-equal "^3.1.3"
10301023
hat "0.0.3"
1031-
ot-json0 "^1.0.1"
1024+
ot-json0 "^1.1.0"
10321025

10331026
shebang-command@^2.0.0:
10341027
version "2.0.0"
@@ -1149,7 +1142,7 @@ type-fest@^0.8.1:
11491142
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
11501143
integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
11511144

1152-
type-is@^1.6.16:
1145+
type-is@^1.6.16, type-is@^1.6.18:
11531146
version "1.6.18"
11541147
resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
11551148
integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
@@ -1169,10 +1162,10 @@ uri-js@^4.2.2:
11691162
dependencies:
11701163
punycode "^2.1.0"
11711164

1172-
uuid@^8.3.0:
1173-
version "8.3.1"
1174-
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31"
1175-
integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==
1165+
uuid@^11.1.0:
1166+
version "11.1.0"
1167+
resolved "https://registry.yarnpkg.com/uuid/-/uuid-11.1.0.tgz#9549028be1753bb934fc96e2bca09bb4105ae912"
1168+
integrity sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==
11761169

11771170
v8-compile-cache@^2.0.3:
11781171
version "2.1.1"
@@ -1208,10 +1201,10 @@ write@1.0.3:
12081201
dependencies:
12091202
mkdirp "^0.5.1"
12101203

1211-
ws@^7.3.1:
1212-
version "7.5.10"
1213-
resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
1214-
integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
1204+
ws@^8.18.0:
1205+
version "8.18.0"
1206+
resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"
1207+
integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==
12151208

12161209
yallist@^4.0.0:
12171210
version "4.0.0"

0 commit comments

Comments
 (0)