serverless-ircd 0.5.0 → 0.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (394) hide show
  1. package/.github/workflows/ci.yml +40 -3
  2. package/.github/workflows/deploy-aws.yml +1 -2
  3. package/.github/workflows/deploy-cf-tcp.yml +1 -5
  4. package/.github/workflows/deploy-cf.yml +1 -2
  5. package/.gitmodules +3 -0
  6. package/CHANGELOG.md +474 -0
  7. package/README.md +219 -22
  8. package/apps/aws-stack/README.md +33 -0
  9. package/apps/aws-stack/package.json +1 -1
  10. package/apps/aws-stack/src/aws-stack.ts +74 -9
  11. package/apps/aws-stack/tests/coverage-command.test.ts +155 -0
  12. package/apps/aws-stack/tests/stack.test.ts +2 -2
  13. package/apps/aws-stack/tests/synth-no-bundle.test.ts +129 -0
  14. package/apps/aws-stack/tests/vitest.setup.ts +18 -0
  15. package/apps/aws-stack/vitest.config.ts +3 -0
  16. package/apps/cf-tcp-container/package.json +1 -1
  17. package/apps/cf-tcp-container/src/config-loader.ts +6 -7
  18. package/apps/cf-tcp-container/src/container-server.ts +3 -0
  19. package/apps/cf-tcp-container/tests/config-loader.test.ts +10 -3
  20. package/apps/cf-tcp-container/wrangler.toml +1 -1
  21. package/apps/cf-worker/package.json +2 -1
  22. package/apps/cf-worker/src/origin-allowlist.ts +99 -0
  23. package/apps/cf-worker/src/worker.ts +89 -9
  24. package/apps/cf-worker/tests/fixtures/web-dist/app/index.html +18 -0
  25. package/apps/cf-worker/tests/fixtures/web-dist/index.html +18 -0
  26. package/apps/cf-worker/tests/origin-allowlist.test.ts +101 -0
  27. package/apps/cf-worker/tests/smoke.test.ts +28 -2
  28. package/apps/cf-worker/tests/ws-origin.test.ts +89 -0
  29. package/apps/cf-worker/vitest.config.ts +1 -1
  30. package/apps/cf-worker/wrangler.test.toml +23 -0
  31. package/apps/cf-worker/wrangler.toml +59 -3
  32. package/apps/local-cli/package.json +1 -1
  33. package/apps/local-cli/src/config-loader.ts +6 -6
  34. package/apps/local-cli/src/main.ts +20 -0
  35. package/apps/local-cli/src/server.ts +9 -7
  36. package/apps/local-cli/tests/e2e.test.ts +112 -28
  37. package/apps/local-cli/tests/tcp.test.ts +71 -19
  38. package/apps/local-cli/tests/ws-subprotocol.test.ts +12 -7
  39. package/apps/web/landing/index.html +217 -0
  40. package/apps/web/package.json +28 -0
  41. package/apps/web/scripts/build.mjs +125 -0
  42. package/apps/web/src/build-env.ts +43 -0
  43. package/apps/web/src/config-schema.ts +138 -0
  44. package/apps/web/static/config.json +28 -0
  45. package/apps/web/static/config.prod.json +28 -0
  46. package/apps/web/static/config.staging.json +28 -0
  47. package/apps/web/tests/build-env.test.ts +63 -0
  48. package/apps/web/tests/build-smoke.test.ts +103 -0
  49. package/apps/web/tests/config-schema.test.ts +432 -0
  50. package/apps/web/tests/workspace.test.ts +12 -0
  51. package/apps/web/tsconfig.json +10 -0
  52. package/apps/web/upstream/.browserslistrc +3 -0
  53. package/apps/web/upstream/.editorconfig +9 -0
  54. package/apps/web/upstream/.eslintignore +3 -0
  55. package/apps/web/upstream/.eslintrc.js +90 -0
  56. package/apps/web/upstream/.github/FUNDING.yml +12 -0
  57. package/apps/web/upstream/.github/ISSUE_TEMPLATE/bug_report.md +38 -0
  58. package/apps/web/upstream/.github/ISSUE_TEMPLATE/feature_request.md +20 -0
  59. package/apps/web/upstream/.github/workflows/push.yml +26 -0
  60. package/apps/web/upstream/.github/workflows/release.yml +33 -0
  61. package/apps/web/upstream/.github/workflows/release_manual.yml +55 -0
  62. package/apps/web/upstream/.prettierrc.js +9 -0
  63. package/apps/web/upstream/.stylelintignore +5 -0
  64. package/apps/web/upstream/.stylelintrc.js +21 -0
  65. package/apps/web/upstream/LICENSE +201 -0
  66. package/apps/web/upstream/README.md +76 -0
  67. package/apps/web/upstream/babel.config.js +25 -0
  68. package/apps/web/upstream/crowdin.yml +3 -0
  69. package/apps/web/upstream/index.html +35 -0
  70. package/apps/web/upstream/jest.config.js +7 -0
  71. package/apps/web/upstream/jsdoc.json +22 -0
  72. package/apps/web/upstream/package.json +80 -0
  73. package/apps/web/upstream/scripts/pre-commit +43 -0
  74. package/apps/web/upstream/src/components/App.vue +516 -0
  75. package/apps/web/upstream/src/components/AppSettings.vue +587 -0
  76. package/apps/web/upstream/src/components/AutoComplete.vue +284 -0
  77. package/apps/web/upstream/src/components/Avatar.vue +105 -0
  78. package/apps/web/upstream/src/components/AwayStatusIndicator.vue +77 -0
  79. package/apps/web/upstream/src/components/BufferKey.vue +121 -0
  80. package/apps/web/upstream/src/components/BufferSettings.vue +97 -0
  81. package/apps/web/upstream/src/components/Captcha.vue +85 -0
  82. package/apps/web/upstream/src/components/ChannelBanlist.vue +96 -0
  83. package/apps/web/upstream/src/components/ChannelInfo.vue +159 -0
  84. package/apps/web/upstream/src/components/ChannelInvitelist.vue +276 -0
  85. package/apps/web/upstream/src/components/ChannelList.vue +345 -0
  86. package/apps/web/upstream/src/components/Container.vue +401 -0
  87. package/apps/web/upstream/src/components/ContainerHeader.vue +522 -0
  88. package/apps/web/upstream/src/components/ControlInput.vue +1016 -0
  89. package/apps/web/upstream/src/components/LoadingAnimation.vue +104 -0
  90. package/apps/web/upstream/src/components/MediaViewer.vue +199 -0
  91. package/apps/web/upstream/src/components/MessageInfo.vue +192 -0
  92. package/apps/web/upstream/src/components/MessageList.vue +1028 -0
  93. package/apps/web/upstream/src/components/MessageListAvatar.vue +20 -0
  94. package/apps/web/upstream/src/components/MessageListMessageCompact.vue +361 -0
  95. package/apps/web/upstream/src/components/MessageListMessageInline.vue +257 -0
  96. package/apps/web/upstream/src/components/MessageListMessageModern.vue +430 -0
  97. package/apps/web/upstream/src/components/NetworkSettings.vue +528 -0
  98. package/apps/web/upstream/src/components/Nicklist.vue +309 -0
  99. package/apps/web/upstream/src/components/NicklistUser.vue +181 -0
  100. package/apps/web/upstream/src/components/NotConnected.vue +271 -0
  101. package/apps/web/upstream/src/components/SelfUser.vue +283 -0
  102. package/apps/web/upstream/src/components/ServerSelector.vue +162 -0
  103. package/apps/web/upstream/src/components/ServerView.vue +126 -0
  104. package/apps/web/upstream/src/components/SettingsAdvanced.vue +232 -0
  105. package/apps/web/upstream/src/components/SettingsAliases.vue +121 -0
  106. package/apps/web/upstream/src/components/Sidebar.vue +429 -0
  107. package/apps/web/upstream/src/components/SidebarAboutBuffer.vue +288 -0
  108. package/apps/web/upstream/src/components/SidebarState.vue +145 -0
  109. package/apps/web/upstream/src/components/StartupError.vue +35 -0
  110. package/apps/web/upstream/src/components/StateBrowser.vue +420 -0
  111. package/apps/web/upstream/src/components/StateBrowserBuffer.vue +124 -0
  112. package/apps/web/upstream/src/components/StateBrowserNetwork.vue +823 -0
  113. package/apps/web/upstream/src/components/StateBrowserUsermenu.vue +162 -0
  114. package/apps/web/upstream/src/components/TypingStatusIndicator.vue +34 -0
  115. package/apps/web/upstream/src/components/TypingUsersList.vue +56 -0
  116. package/apps/web/upstream/src/components/UrlEmbed.vue +149 -0
  117. package/apps/web/upstream/src/components/UserBox.vue +728 -0
  118. package/apps/web/upstream/src/components/inputtools/Emoji.vue +67 -0
  119. package/apps/web/upstream/src/components/inputtools/TextStyle.vue +142 -0
  120. package/apps/web/upstream/src/components/startups/CommonLayout.vue +208 -0
  121. package/apps/web/upstream/src/components/startups/CustomServer.vue +495 -0
  122. package/apps/web/upstream/src/components/startups/KiwiBnc.vue +361 -0
  123. package/apps/web/upstream/src/components/startups/Personal.vue +317 -0
  124. package/apps/web/upstream/src/components/startups/Welcome.vue +544 -0
  125. package/apps/web/upstream/src/components/startups/ZncLogin.vue +229 -0
  126. package/apps/web/upstream/src/components/utils/InputConfirm.vue +68 -0
  127. package/apps/web/upstream/src/components/utils/InputPrompt.vue +118 -0
  128. package/apps/web/upstream/src/components/utils/InputText.vue +172 -0
  129. package/apps/web/upstream/src/components/utils/IrcInput.vue +579 -0
  130. package/apps/web/upstream/src/components/utils/PluginWrapper.vue +26 -0
  131. package/apps/web/upstream/src/components/utils/TabbedView.vue +149 -0
  132. package/apps/web/upstream/src/components/utils/TransitionExpand.vue +97 -0
  133. package/apps/web/upstream/src/helpers/Colours.js +128 -0
  134. package/apps/web/upstream/src/helpers/IrcdDiffs.js +26 -0
  135. package/apps/web/upstream/src/helpers/Md5.js +193 -0
  136. package/apps/web/upstream/src/helpers/Misc.js +401 -0
  137. package/apps/web/upstream/src/helpers/TextFormatting.js +237 -0
  138. package/apps/web/upstream/src/libs/AliasRewriter.js +157 -0
  139. package/apps/web/upstream/src/libs/AudioManager.js +60 -0
  140. package/apps/web/upstream/src/libs/BouncerMiddleware.js +247 -0
  141. package/apps/web/upstream/src/libs/BouncerProvider.js +551 -0
  142. package/apps/web/upstream/src/libs/ChathistoryMiddleware.js +153 -0
  143. package/apps/web/upstream/src/libs/ConfigLoader.js +94 -0
  144. package/apps/web/upstream/src/libs/EmojiProvider.js +46 -0
  145. package/apps/web/upstream/src/libs/GlobalApi.js +346 -0
  146. package/apps/web/upstream/src/libs/IPC.js +51 -0
  147. package/apps/web/upstream/src/libs/InputHandler.js +921 -0
  148. package/apps/web/upstream/src/libs/IrcClient.js +1506 -0
  149. package/apps/web/upstream/src/libs/Logger.js +71 -0
  150. package/apps/web/upstream/src/libs/Message.js +169 -0
  151. package/apps/web/upstream/src/libs/MessageFormatter.js +364 -0
  152. package/apps/web/upstream/src/libs/MessageParser.js +249 -0
  153. package/apps/web/upstream/src/libs/Notifications.js +78 -0
  154. package/apps/web/upstream/src/libs/ServerConnection.js +270 -0
  155. package/apps/web/upstream/src/libs/ServerSession.js +102 -0
  156. package/apps/web/upstream/src/libs/SoundBleep.js +20 -0
  157. package/apps/web/upstream/src/libs/StatePersistence.js +90 -0
  158. package/apps/web/upstream/src/libs/ThemeManager.js +128 -0
  159. package/apps/web/upstream/src/libs/TypingMiddleware.js +105 -0
  160. package/apps/web/upstream/src/libs/WindowTitle.js +63 -0
  161. package/apps/web/upstream/src/libs/batchedAdd.js +74 -0
  162. package/apps/web/upstream/src/libs/bufferTools.js +177 -0
  163. package/apps/web/upstream/src/libs/polyfill/Element.closest.js +18 -0
  164. package/apps/web/upstream/src/libs/renderers/Html.js +113 -0
  165. package/apps/web/upstream/src/libs/settingTools.js +31 -0
  166. package/apps/web/upstream/src/libs/state/BufferState.js +703 -0
  167. package/apps/web/upstream/src/libs/state/NetworkState.js +158 -0
  168. package/apps/web/upstream/src/libs/state/UserState.js +89 -0
  169. package/apps/web/upstream/src/libs/state/common.js +26 -0
  170. package/apps/web/upstream/src/libs/state.js +961 -0
  171. package/apps/web/upstream/src/libs/storage/Local.js +51 -0
  172. package/apps/web/upstream/src/main.js +566 -0
  173. package/apps/web/upstream/src/res/autocompleteCommands.js +31 -0
  174. package/apps/web/upstream/src/res/configTemplates.js +373 -0
  175. package/apps/web/upstream/src/res/globalStyle.css +277 -0
  176. package/apps/web/upstream/src/res/kiwiLoadingLogo.png +0 -0
  177. package/apps/web/upstream/src/res/locales/app.af-ZA.po +1145 -0
  178. package/apps/web/upstream/src/res/locales/app.ar-SA.po +1145 -0
  179. package/apps/web/upstream/src/res/locales/app.bg-BG.po +1145 -0
  180. package/apps/web/upstream/src/res/locales/app.bs-BA.po +1145 -0
  181. package/apps/web/upstream/src/res/locales/app.ca-ES.po +1145 -0
  182. package/apps/web/upstream/src/res/locales/app.cs-CZ.po +1145 -0
  183. package/apps/web/upstream/src/res/locales/app.da-DK.po +1145 -0
  184. package/apps/web/upstream/src/res/locales/app.de-DE.po +1145 -0
  185. package/apps/web/upstream/src/res/locales/app.dev.po +1246 -0
  186. package/apps/web/upstream/src/res/locales/app.el-GR.po +1145 -0
  187. package/apps/web/upstream/src/res/locales/app.en-US.po +1145 -0
  188. package/apps/web/upstream/src/res/locales/app.es-419.po +1145 -0
  189. package/apps/web/upstream/src/res/locales/app.es-AR.po +1145 -0
  190. package/apps/web/upstream/src/res/locales/app.es-EM.po +536 -0
  191. package/apps/web/upstream/src/res/locales/app.es-ES.po +1145 -0
  192. package/apps/web/upstream/src/res/locales/app.es-US.po +1145 -0
  193. package/apps/web/upstream/src/res/locales/app.eu-ES.po +1145 -0
  194. package/apps/web/upstream/src/res/locales/app.fi-FI.po +1145 -0
  195. package/apps/web/upstream/src/res/locales/app.fr-FR.po +1145 -0
  196. package/apps/web/upstream/src/res/locales/app.gl-ES.po +1145 -0
  197. package/apps/web/upstream/src/res/locales/app.he-IL.po +1145 -0
  198. package/apps/web/upstream/src/res/locales/app.hi-IN.po +1145 -0
  199. package/apps/web/upstream/src/res/locales/app.hu-HU.po +1145 -0
  200. package/apps/web/upstream/src/res/locales/app.id-ID.po +1145 -0
  201. package/apps/web/upstream/src/res/locales/app.it-IT.po +1145 -0
  202. package/apps/web/upstream/src/res/locales/app.ja-JP.po +1145 -0
  203. package/apps/web/upstream/src/res/locales/app.ko-KR.po +1145 -0
  204. package/apps/web/upstream/src/res/locales/app.nl-NL.po +1145 -0
  205. package/apps/web/upstream/src/res/locales/app.no-NO.po +1145 -0
  206. package/apps/web/upstream/src/res/locales/app.pl-PL.po +1145 -0
  207. package/apps/web/upstream/src/res/locales/app.pt-BR.po +1145 -0
  208. package/apps/web/upstream/src/res/locales/app.pt-PT.po +1145 -0
  209. package/apps/web/upstream/src/res/locales/app.ro-RO.po +1145 -0
  210. package/apps/web/upstream/src/res/locales/app.ru-RU.po +1145 -0
  211. package/apps/web/upstream/src/res/locales/app.sl-SI.po +1145 -0
  212. package/apps/web/upstream/src/res/locales/app.sq-AL.po +1145 -0
  213. package/apps/web/upstream/src/res/locales/app.sr-SP.po +1145 -0
  214. package/apps/web/upstream/src/res/locales/app.sv-SE.po +1145 -0
  215. package/apps/web/upstream/src/res/locales/app.tr-TR.po +1145 -0
  216. package/apps/web/upstream/src/res/locales/app.uk-UA.po +1145 -0
  217. package/apps/web/upstream/src/res/locales/app.vi-VN.po +1145 -0
  218. package/apps/web/upstream/src/res/locales/app.zh-CN.po +1145 -0
  219. package/apps/web/upstream/src/res/locales/app.zh-TW.po +1145 -0
  220. package/apps/web/upstream/src/res/localesList.json +27 -0
  221. package/apps/web/upstream/src/res/logo.png +0 -0
  222. package/apps/web/upstream/src/thirdparty/about.html +43 -0
  223. package/apps/web/upstream/src/thirdparty/index.js +5 -0
  224. package/apps/web/upstream/src/thirdparty/kiwiirccom.vue +185 -0
  225. package/apps/web/upstream/static/config.json +28 -0
  226. package/apps/web/upstream/static/emoticons/smile.png +0 -0
  227. package/apps/web/upstream/static/favicon.png +0 -0
  228. package/apps/web/upstream/static/highlight.mp3 +0 -0
  229. package/apps/web/upstream/static/highlight.ogg +0 -0
  230. package/apps/web/upstream/static/locales/.gitignore +2 -0
  231. package/apps/web/upstream/static/plugins/customise.html.example +10 -0
  232. package/apps/web/upstream/static/themes/coffee/theme.css +145 -0
  233. package/apps/web/upstream/static/themes/common/base.css +1064 -0
  234. package/apps/web/upstream/static/themes/dark/theme.css +196 -0
  235. package/apps/web/upstream/static/themes/default/theme.css +92 -0
  236. package/apps/web/upstream/static/themes/elite/theme.css +248 -0
  237. package/apps/web/upstream/static/themes/grayfox/theme.css +143 -0
  238. package/apps/web/upstream/static/themes/nightswatch/theme.css +367 -0
  239. package/apps/web/upstream/static/themes/osprey/theme.css +115 -0
  240. package/apps/web/upstream/static/themes/radioactive/theme.css +1211 -0
  241. package/apps/web/upstream/static/themes/sky/theme.css +107 -0
  242. package/apps/web/upstream/tests/unit/BatchAdd.spec.js +174 -0
  243. package/apps/web/upstream/tests/unit/MessageParser.spec.js +125 -0
  244. package/apps/web/upstream/tests/unit/Misc.spec.js +24 -0
  245. package/apps/web/upstream/tests/unit/NetworkState.spec.js +58 -0
  246. package/apps/web/upstream/tests/unit/StartupError.spec.js +20 -0
  247. package/apps/web/upstream/vue.config.js +150 -0
  248. package/apps/web/upstream/yarn.lock +9767 -0
  249. package/apps/web/vitest.config.ts +13 -0
  250. package/biome.json +2 -0
  251. package/docs/ADR-001-pure-reducers-and-effect-system.md +74 -0
  252. package/docs/ADR-002-location-of-authority.md +82 -0
  253. package/docs/ADR-003-durable-object-sharding.md +110 -0
  254. package/docs/ADR-004-dynamodb-schema.md +96 -0
  255. package/docs/ADR-005-wss-only-transport-v1.md +83 -0
  256. package/docs/ADR-006-sasl-mechanism-scope.md +96 -0
  257. package/docs/ADR-007-deterministic-ports.md +82 -0
  258. package/docs/ADR-008-monorepo-tooling.md +60 -0
  259. package/docs/ADR-009-dual-transport-wss-and-irc-tls.md +138 -0
  260. package/docs/ADR-Index.md +15 -0
  261. package/docs/AWS-Adapter-Architecture.md +496 -0
  262. package/docs/AWS-Deployment.md +1275 -0
  263. package/docs/AWS-TCP-Deployment.md +410 -0
  264. package/docs/Cloudflare-Deployment-Guide.md +719 -0
  265. package/docs/Cloudflare-TCP-Deployment.md +510 -0
  266. package/docs/Home.md +16 -0
  267. package/docs/Observability.md +87 -0
  268. package/docs/PlanExtensions.md +812 -0
  269. package/docs/PlanIRCv3Websocket.md +503 -0
  270. package/docs/PlanWebClient.md +451 -0
  271. package/docs/Release-Process.md +443 -0
  272. package/docs/WebClientGuide.md +535 -0
  273. package/package.json +2 -2
  274. package/packages/aws-adapter/package.json +1 -1
  275. package/packages/aws-adapter/src/handlers/default.ts +3 -0
  276. package/packages/aws-adapter/src/handlers/nlb-stream.ts +9 -0
  277. package/packages/aws-adapter/src/serialize.ts +29 -1
  278. package/packages/aws-adapter/tests/account-store-dynamo.test.ts +49 -8
  279. package/packages/aws-adapter/tests/account-store.test.ts +4 -7
  280. package/packages/aws-adapter/tests/aws-harness.ts +5 -2
  281. package/packages/aws-adapter/tests/aws-integration.test.ts +8 -4
  282. package/packages/aws-adapter/tests/aws-runtime.test.ts +79 -0
  283. package/packages/aws-adapter/tests/config-loader.test.ts +11 -2
  284. package/packages/aws-adapter/tests/connect.test.ts +9 -9
  285. package/packages/aws-adapter/tests/disconnect-fanout.test.ts +3 -4
  286. package/packages/aws-adapter/tests/global-setup.ts +55 -30
  287. package/packages/aws-adapter/tests/gone-exception.test.ts +4 -9
  288. package/packages/aws-adapter/tests/handlers.test.ts +90 -4
  289. package/packages/aws-adapter/tests/message-store.test.ts +6 -5
  290. package/packages/aws-adapter/tests/nlb-stream.test.ts +60 -8
  291. package/packages/cf-adapter/package.json +2 -1
  292. package/packages/cf-adapter/src/connection-do.ts +3 -0
  293. package/packages/cf-adapter/src/serialize.ts +25 -4
  294. package/packages/cf-adapter/tests/cf-harness.ts +12 -1
  295. package/packages/cf-adapter/tests/cf-runtime.test.ts +269 -0
  296. package/packages/cf-adapter/tests/channel-do.test.ts +117 -0
  297. package/packages/cf-adapter/tests/config-loader.test.ts +49 -0
  298. package/packages/cf-adapter/tests/connection-do-pure.test.ts +91 -0
  299. package/packages/cf-adapter/tests/d1-account-store.test.ts +48 -0
  300. package/packages/cf-adapter/tests/registry-do.test.ts +104 -0
  301. package/packages/cf-adapter/tests/serialize.test.ts +308 -0
  302. package/packages/cf-adapter/vitest.config.ts +1 -1
  303. package/packages/in-memory-runtime/package.json +1 -1
  304. package/packages/irc-core/package.json +1 -1
  305. package/packages/irc-core/reports/mutation/mutation.html +342 -0
  306. package/packages/irc-core/src/caps/capabilities.ts +37 -3
  307. package/packages/irc-core/src/caps/index.ts +1 -0
  308. package/packages/irc-core/src/caps/sts.ts +84 -0
  309. package/packages/irc-core/src/commands/account-notify.ts +53 -0
  310. package/packages/irc-core/src/commands/away.ts +9 -3
  311. package/packages/irc-core/src/commands/cap.ts +23 -5
  312. package/packages/irc-core/src/commands/chathistory.ts +40 -11
  313. package/packages/irc-core/src/commands/index.ts +34 -0
  314. package/packages/irc-core/src/commands/isupport.ts +53 -0
  315. package/packages/irc-core/src/commands/mode.ts +8 -1
  316. package/packages/irc-core/src/commands/monitor.ts +327 -0
  317. package/packages/irc-core/src/commands/multiline.ts +256 -0
  318. package/packages/irc-core/src/commands/pre-away.ts +112 -0
  319. package/packages/irc-core/src/commands/privmsg.ts +19 -12
  320. package/packages/irc-core/src/commands/read-marker.ts +108 -0
  321. package/packages/irc-core/src/commands/registration.ts +8 -0
  322. package/packages/irc-core/src/commands/sasl.ts +24 -1
  323. package/packages/irc-core/src/commands/tagmsg.ts +71 -1
  324. package/packages/irc-core/src/commands/whois.ts +5 -0
  325. package/packages/irc-core/src/config.ts +65 -10
  326. package/packages/irc-core/src/effects.ts +14 -0
  327. package/packages/irc-core/src/ports.ts +389 -0
  328. package/packages/irc-core/src/protocol/index.ts +14 -0
  329. package/packages/irc-core/src/protocol/labeled-response.ts +133 -0
  330. package/packages/irc-core/src/protocol/numerics.ts +15 -0
  331. package/packages/irc-core/src/protocol/outbound.ts +16 -1
  332. package/packages/irc-core/src/protocol/standard-replies.ts +277 -0
  333. package/packages/irc-core/src/state/connection.ts +32 -1
  334. package/packages/irc-core/src/types.ts +112 -0
  335. package/packages/irc-core/stryker.commands.conf.json +1 -2
  336. package/packages/irc-core/tests/away-store.test.ts +73 -0
  337. package/packages/irc-core/tests/batch.test.ts +15 -0
  338. package/packages/irc-core/tests/caps/capabilities.test.ts +119 -2
  339. package/packages/irc-core/tests/caps/sts.test.ts +123 -0
  340. package/packages/irc-core/tests/commands/account-notify.test.ts +171 -0
  341. package/packages/irc-core/tests/commands/away.test.ts +85 -2
  342. package/packages/irc-core/tests/commands/cap.test.ts +165 -0
  343. package/packages/irc-core/tests/commands/chathistory.test.ts +148 -1
  344. package/packages/irc-core/tests/commands/echo-message.test.ts +9 -3
  345. package/packages/irc-core/tests/commands/isupport.test.ts +80 -0
  346. package/packages/irc-core/tests/commands/mode.test.ts +72 -0
  347. package/packages/irc-core/tests/commands/monitor.test.ts +411 -0
  348. package/packages/irc-core/tests/commands/multiline.test.ts +428 -0
  349. package/packages/irc-core/tests/commands/pre-away.test.ts +241 -0
  350. package/packages/irc-core/tests/commands/privmsg.test.ts +154 -3
  351. package/packages/irc-core/tests/commands/read-marker.test.ts +211 -0
  352. package/packages/irc-core/tests/commands/registration.test.ts +64 -0
  353. package/packages/irc-core/tests/commands/sasl.test.ts +116 -2
  354. package/packages/irc-core/tests/commands/tagmsg.test.ts +357 -0
  355. package/packages/irc-core/tests/commands/whois.test.ts +34 -0
  356. package/packages/irc-core/tests/config.test.ts +103 -13
  357. package/packages/irc-core/tests/labeled-response.test.ts +181 -0
  358. package/packages/irc-core/tests/message-tags.test.ts +114 -0
  359. package/packages/irc-core/tests/monitor-store.test.ts +200 -0
  360. package/packages/irc-core/tests/numerics.test.ts +13 -0
  361. package/packages/irc-core/tests/parser.test.ts +109 -0
  362. package/packages/irc-core/tests/read-marker-store.test.ts +108 -0
  363. package/packages/irc-core/tests/standard-replies.test.ts +412 -0
  364. package/packages/irc-core/tests/types.test.ts +27 -0
  365. package/packages/irc-server/package.json +1 -1
  366. package/packages/irc-server/src/actor.ts +450 -3
  367. package/packages/irc-server/src/dispatch.ts +108 -16
  368. package/packages/irc-server/tests/actor.test.ts +1432 -39
  369. package/packages/irc-server/tests/dispatch.test.ts +263 -2
  370. package/packages/irc-test-support/package.json +1 -1
  371. package/packages/irc-test-support/src/index.ts +6 -0
  372. package/packages/irc-test-support/src/scenarios.ts +24 -2
  373. package/packages/irc-test-support/src/test-config.ts +54 -0
  374. package/packages/irc-test-support/tests/test-config.test.ts +51 -0
  375. package/tools/ci-hardening/package.json +1 -1
  376. package/tools/ci-hardening/tests/ddb-local.test.ts +82 -0
  377. package/tools/load-test/package.json +33 -0
  378. package/tools/load-test/src/client.ts +351 -0
  379. package/tools/load-test/src/config.ts +313 -0
  380. package/tools/load-test/src/harness.ts +116 -0
  381. package/tools/load-test/src/main.ts +120 -0
  382. package/tools/load-test/src/metrics.ts +168 -0
  383. package/tools/load-test/src/report.ts +106 -0
  384. package/tools/load-test/tests/client.test.ts +212 -0
  385. package/tools/load-test/tests/config.test.ts +152 -0
  386. package/tools/load-test/tests/framing.test.ts +37 -0
  387. package/tools/load-test/tests/harness.test.ts +165 -0
  388. package/tools/load-test/tests/metrics.test.ts +174 -0
  389. package/tools/load-test/tests/report.test.ts +161 -0
  390. package/tools/load-test/tests/smoke.test.ts +67 -0
  391. package/tools/load-test/tsconfig.build.json +12 -0
  392. package/tools/load-test/tsconfig.test.json +10 -0
  393. package/tools/load-test/vitest.config.ts +29 -0
  394. package/tools/tcp-ws-forwarder/package.json +1 -1
@@ -0,0 +1,367 @@
1
+ @import '../common/base.css';
2
+
3
+ :root {
4
+ /* Primary Variables */
5
+ --brand-primary: #000;
6
+ --brand-primary-hover: #2d2d2d;
7
+ --brand-midtone: #1b1b1b;
8
+ --brand-darktone: #000;
9
+ --brand-default-bg: #1b1b1b;
10
+ --brand-default-fg: #f1f1f1;
11
+
12
+ /* Warning colors */
13
+ --brand-notice: #f6c358;
14
+ --brand-warning: #fcb46e;
15
+ --brand-error: #bf5155;
16
+
17
+ /* Input elements */
18
+ --brand-input-border: #000000;
19
+ --brand-input-fg: #616161;
20
+ --brand-input-bg: transparent;
21
+
22
+ /* Connection Indicator top */
23
+ --comp-workspace-before-bg: var(--brand-primary);
24
+ --comp-bg-kiwi-workspace--disconnected-after-bg: var(--brand-error);
25
+
26
+ /* Container Header */
27
+ --comp-header-bg: var(--brand-default-bg);
28
+ --comp-header-name-fg: var(--brand-default-fg);
29
+ --comp-header-option-active-fg: var(--brand-default-bg);
30
+ --comp-header-option-active-bg: var(--brand-primary);
31
+
32
+ /* StateBrowser */
33
+ --comp-statebrowser-fg: #fff;
34
+ --comp-statebrowser-bg: #000;
35
+ --comp-statebrowser-bg-networkname: #151515;
36
+ --comp-statebrowser-channel-active-bg: #ffffff0d;
37
+ --comp-statebrowser-channel-active-fg: #fff;
38
+ --comp-usermenu-open-bg: #151515;
39
+ --comp-statebrowser-network-border: #bda28e;
40
+
41
+
42
+ /* Sidebars ( Right Side ) */
43
+ --comp-sidebar-bg: var(--brand-default-bg);
44
+ --comp-sidebar-fg: #fff;
45
+ --comp-aboutbuffer-bg: rgba(0, 0, 0, 0.03);
46
+ --comp-aboutbuffer-header-bg: #42b992;
47
+
48
+ /* Misc */
49
+ --brand-link-normal: var(--brand-default-fg);
50
+ --brand-link--hover: var(--brand-default-fg);
51
+ --brand-shadow: rgba(0, 0, 0, 0.1);
52
+ --comp-border: #444;
53
+ }
54
+
55
+ /* Welcome */
56
+ .kiwi-welcome-simple-form .u-submit {
57
+ color: #fff;
58
+ }
59
+
60
+ /* Container Header */
61
+ .kiwi-workspace::before {
62
+ background: #4e4e4e;
63
+ }
64
+
65
+ .kiwi-header-option--active a,
66
+ .kiwi-header-option:hover a {
67
+ color: var(--brand-default-fg);
68
+ }
69
+
70
+ /* Sidebar */
71
+ .kiwi-aboutbuffer h4 {
72
+ color: var(--brand-default-fg);
73
+ background-color: #000;
74
+ }
75
+
76
+ .kiwi-appsettings-close,
77
+ .kiwi-appsettings-block h3,
78
+ .kiwi-networksettings .kiwi-title {
79
+ background-color: var(--brand-primary);
80
+ }
81
+
82
+ .kiwi-appsettings-block h3,
83
+ .kiwi-appsettings-close {
84
+ color: var(--brand-default-fg);
85
+ }
86
+
87
+ .kiwi-appsettings-section {
88
+ border-left: 1px solid #444;
89
+ border-right: 1px solid #444;
90
+ border-bottom: 1px solid #444;
91
+ }
92
+
93
+ .kiwi-appsettings-block h3 {
94
+ border-top: 1px solid #444;
95
+ border-left: 1px solid #444;
96
+ border-right: 1px solid #444;
97
+ }
98
+
99
+ .kiwi-networksettings .kiwi-title {
100
+ border-top-color: var(--brand-primary-hover);
101
+ }
102
+
103
+ .kiwi-statebrowser-network.kiwi-statebrowser-network--active .kiwi-statebrowser-network-header {
104
+ border-left: 3px solid var(--brand-primary-hover);
105
+ }
106
+
107
+ .u-tabbed-view-tabs {
108
+ background-color: #000;
109
+ border-bottom: 3px solid #444;
110
+ }
111
+
112
+ .u-tabbed-view-tabs .u-tabbed-view-tab:hover,
113
+ .u-tabbed-view-tabs .u-tabbed-view-tab.u-tabbed-view-tab--active {
114
+ border-bottom-color: #444;
115
+ background-color: #313131;
116
+ }
117
+
118
+ .kiwi-statebrowser-newnetwork {
119
+ border-top-color: var(--brand-primary-hover);
120
+ }
121
+
122
+ .kiwi-statebrowser-newnetwork a:hover {
123
+ background: var(--brand-primary-hover);
124
+ }
125
+
126
+ .kiwi-network-name-options {
127
+ background-color: var(--comp-statebrowser-bg);
128
+ }
129
+
130
+ .kiwi-statebrowser-channel-leave {
131
+ background: transparent;
132
+ }
133
+
134
+ .kiwi-statebrowser-channelfilter a,
135
+ .kiwi-statebrowser-channelfilter a:hover {
136
+ color: #fff;
137
+ }
138
+
139
+ .kiwi-awaystatusindicator {
140
+ background: #41e8c9;
141
+ }
142
+ .kiwi-awaystatusindicator.kiwi-awaystatusindicator--away {
143
+ background: var(--brand-error);
144
+ }
145
+
146
+ .kiwi-startup-common-section-info {
147
+ border-left-color: var(--brand-primary);
148
+ }
149
+
150
+ .kiwi-sidebar-options {
151
+ color: var(--brand-default-fg);
152
+ }
153
+
154
+
155
+ /* Statebrowser */
156
+ .kiwi-statebrowser {
157
+ border-right: 2px solid #444;
158
+ }
159
+
160
+ .kiwi-statebrowser-usermenu-avatar:hover .kiwi-avatar-inner,
161
+ .kiwi-statebrowser-usermenu--open .kiwi-avatar-inner {
162
+ background-color: #000 !important;
163
+ color: #f1f1f1 !important;
164
+ }
165
+
166
+ .kiwi-statebrowser-usermenu-avatar .kiwi-awaystatusindicator {
167
+ border-color: #4b4b4b;
168
+ }
169
+
170
+ .kiwi-network-name-options .kiwi-network-name-option {
171
+ color: var(--brand-default-fg);
172
+ }
173
+
174
+ .kiwi-statebrowser-newchannel-inputwrap input[type='text'] {
175
+ color: #f1f1f1;
176
+ }
177
+
178
+ .kiwi-statebrowser-newnetwork a {
179
+ color: var(--brand-default-fg);
180
+ }
181
+
182
+ /* Inputs */
183
+ .u-form input[type='checkbox']:checked,
184
+ .u-form input[type='radio']:checked {
185
+ background-color: #f1f1f1;
186
+ }
187
+
188
+ .u-form .u-input:focus {
189
+ border-color: #6b6b6b;
190
+ }
191
+
192
+ .u-form select {
193
+ background-color: var(--brand-primary);
194
+ }
195
+
196
+ .u-link {
197
+ color: var(--brand-default-fg);
198
+ }
199
+
200
+ /* Message list */
201
+ .kiwi-messagelist {
202
+ background: #000;
203
+ }
204
+ .kiwi-messagelist .kiwi-messagelist-body {
205
+ color: #adadad;
206
+ }
207
+
208
+ .kiwi-messagelist .kiwi-messagelist-message--highlight,
209
+ .kiwi-messagelist .kiwi-messagelist-message--hover {
210
+ border-left-color: #3c3c3c;
211
+ }
212
+
213
+ .kiwi-messagelist-message-notice {
214
+ background: #3c3c3c;
215
+ }
216
+
217
+ .kiwi-avatar-inner {
218
+ background-color: var(--brand-default-bg);
219
+ color: var(--brand-default-fg);
220
+ }
221
+
222
+ /* Aliases */
223
+ .kiwi-settings-aliases-help {
224
+ border-color: var(--brand-default-fg);
225
+ }
226
+
227
+ .kiwi-settings-aliases-help em {
228
+ color: var(--brand-default-fg);
229
+ }
230
+
231
+ /* Misc */
232
+ .kiwi-header-server-connection .u-button,
233
+ .kiwi-header .kiwi-header-notjoined .u-link,
234
+ .u-button-primary,
235
+ .u-button-warning,
236
+ .kiwi-networksettings .kiwi-title,
237
+ .kiwi-notconnected,
238
+ .kiwi-notconnected-button {
239
+ color: #f1f1f1;
240
+ }
241
+
242
+ .kiwi-notconnected-button {
243
+ border-color: #f1f1f1;
244
+ }
245
+
246
+ .kiwi-networksettings .kiwi-connect-to-newnetwork {
247
+ background: #444;
248
+ color: #fff;
249
+ }
250
+
251
+ .kiwi-networksettings .kiwi-networksettings-server-types,
252
+ .kiwi-networksettings .kiwi-networksettings-server-types .kiwi-network-type-button {
253
+ color: #fff;
254
+ border-color: #fff;
255
+ }
256
+
257
+ .kiwi-networksettings .kiwi-networksettings-server-types .kiwi-network-type-button:hover,
258
+ .kiwi-networksettings .kiwi-networksettings-server-types .kiwi-network-type-button.kiwi-networksettings-server-type-active {
259
+ background: #444;
260
+ color: #fff;
261
+ }
262
+
263
+ .kiwi-channellist-topic a {
264
+ color: #f1f1f1;
265
+ text-decoration: underline;
266
+ }
267
+
268
+ .kiwi-messagelist-message-error,
269
+ .kiwi-messagelist-message.kiwi-messagelist-message-error.kiwi-messagelist-message--highlight {
270
+ color: #f1f1f1;
271
+ }
272
+
273
+ button.u-button.u-button-primary.u-submit.kiwi-welcome-znc-start,
274
+ .kiwi-statebrowser-channel-label {
275
+ color: var(--brand-default-fg);
276
+ }
277
+
278
+ .kiwi-statebrowser-channel-label {
279
+ background: #383838;
280
+ }
281
+
282
+ .kiwi-statebrowser-channel-label--highlight {
283
+ background: var(--brand-error);
284
+ }
285
+
286
+ .kiwi-welcome-znc h2 {
287
+ color: var(--brand-default-bg);
288
+ }
289
+
290
+ .kiwi-welcome-znc-form .u-input-text {
291
+ background: transparent;
292
+ color: var(--brand-default-bg);
293
+ }
294
+
295
+ .kiwi-container-toggledraw-statebrowser-messagecount {
296
+ background-color: #4c4b4b;
297
+ color: var(--brand-default-fg);
298
+ }
299
+
300
+ .kiwi-container-toggledraw-statebrowser-messagecount::after {
301
+ border-right-color: #4c4b4b;
302
+ }
303
+
304
+ .kiwi-wrap--statebrowser-drawopen .kiwi-container-toggledraw-statebrowser-messagecount::after {
305
+ border-left-color: #4c4b4b;
306
+ }
307
+
308
+ .kiwi-autocomplete-item--selected {
309
+ background: #3c3c3c;
310
+ color: #ffffff;
311
+ }
312
+
313
+ .kiwi-autocomplete-item--selected .u-link {
314
+ color: #fdfdfd;
315
+ }
316
+
317
+ .kiwi-messagelist-message--compact .kiwi-messagelist-time {
318
+ color: #fff;
319
+ }
320
+
321
+ .kiwi-controlinput-button {
322
+ background-color: var(--brand-primary);
323
+ border: 2px solid var(--brand-primary);
324
+ }
325
+
326
+ .kiwi-controlinput-button:hover,
327
+ .kiwi-controlinput-tools,
328
+ .kiwi-controlinput-tools-container,
329
+ .kiwi-controlinput-send {
330
+ color: var(--brand-default-fg);
331
+ background-color: var(--brand-default-bg);
332
+ }
333
+
334
+ /* IRC Text Colours */
335
+ .irc-fg-colour-white { color: #fff; }
336
+ .irc-fg-colour-black { color: #000; }
337
+ .irc-fg-colour-blue { color: #00f; }
338
+ .irc-fg-colour-green { color: #009300; }
339
+ .irc-fg-colour-light-red { color: #ff5959; }
340
+ .irc-fg-colour-brown { color: #743a00; }
341
+ .irc-fg-colour-purple { color: #a500ff; }
342
+ .irc-fg-colour-orange { color: #ff8c00; }
343
+ .irc-fg-colour-yellow { color: #ff0; }
344
+ .irc-fg-colour-light-green { color: #6fff6f; }
345
+ .irc-fg-colour-cyan { color: #0cc; }
346
+ .irc-fg-colour-light-cyan { color: #6dffff; }
347
+ .irc-fg-colour-light-blue { color: #59b4ff; }
348
+ .irc-fg-colour-pink { color: #f0f; }
349
+ .irc-fg-colour-grey { color: #a6a6a6; }
350
+ .irc-fg-colour-light-grey { color: #e2e2e2; }
351
+
352
+ .irc-bg-colour-white { background-color: #fff; }
353
+ .irc-bg-colour-black { background-color: #000; }
354
+ .irc-bg-colour-blue { background-color: #00f; }
355
+ .irc-bg-colour-green { background-color: #009300; }
356
+ .irc-bg-colour-light-red { background-color: #ff5959; }
357
+ .irc-bg-colour-brown { background-color: #743a00; }
358
+ .irc-bg-colour-purple { background-color: #a500ff; }
359
+ .irc-bg-colour-orange { background-color: #ff8c00; }
360
+ .irc-bg-colour-yellow { background-color: #ff0; }
361
+ .irc-bg-colour-light-green { background-color: #6fff6f; }
362
+ .irc-bg-colour-cyan { background-color: #0cc; }
363
+ .irc-bg-colour-light-cyan { background-color: #6dffff; }
364
+ .irc-bg-colour-light-blue { background-color: #59b4ff; }
365
+ .irc-bg-colour-pink { background-color: #f0f; }
366
+ .irc-bg-colour-grey { background-color: #a6a6a6; }
367
+ .irc-bg-colour-light-grey { background-color: #e2e2e2; }
@@ -0,0 +1,115 @@
1
+ @import '../common/base.css';
2
+
3
+ :root {
4
+ /* Primary Variables */
5
+ --brand-primary: #4d6075;
6
+ --brand-primary-hover: #73879c;
7
+ --brand-midtone: #f1f1f1;
8
+ --brand-darktone: #969696;
9
+ --brand-default-bg: #fff;
10
+ --brand-default-fg: #22231f;
11
+
12
+ /* Warning colors */
13
+ --brand-notice: #f6c358;
14
+ --brand-warning: #fcb46e;
15
+ --brand-error: #bf5155;
16
+
17
+ /* Connection Indicator top */
18
+ --comp-workspace-before-bg: var(--brand-primary);
19
+ --comp-bg-kiwi-workspace--disconnected-after-bg: var(--brand-error);
20
+
21
+ /* Container Header */
22
+ --comp-header-bg: var(--brand-default-bg);
23
+ --comp-header-name-fg: var(--brand-default-fg);
24
+ --comp-header-option-active-fg: var(--brand-default-bg);
25
+ --comp-header-option-active-bg: var(--brand-primary);
26
+
27
+ /* StateBrowser */
28
+ --comp-statebrowser-fg: #fff;
29
+ --comp-statebrowser-bg: #212d3a;
30
+ --comp-statebrowser-bg-networkname: #687282;
31
+ --comp-statebrowser-channel-active-bg: #ffffff0d;
32
+ --comp-statebrowser-channel-active-fg: #fff;
33
+ --comp-usermenu-open-bg: #161d25;
34
+ --comp-statebrowser-network-border: #656565;
35
+
36
+
37
+ /* Sidebars ( Right Side ) */
38
+ --comp-sidebar-bg: #fff;
39
+ --comp-sidebar-fg: #22231f;
40
+ --comp-aboutbuffer-bg: rgba(0, 0, 0, 0.03);
41
+ --comp-aboutbuffer-header-bg: var(--brand-primary);
42
+
43
+ /* Misc */
44
+ --brand-link-normal: var(--brand-primary);
45
+ --brand-link--hover: var(--brand-primary-hover);
46
+ --brand-shadow: rgba(0, 0, 0, 0.1);
47
+ --comp-border: #b2b2b2;
48
+ }
49
+
50
+ /* Welcome Screens */
51
+ .kiwi-startup-common-section-info {
52
+ border-left-color: var(--brand-primary);
53
+ }
54
+
55
+ /* StateBrowser */
56
+ .kiwi-statebrowser-usermenu .kiwi-awaystatusindicator {
57
+ background-color: #42b992;
58
+ }
59
+
60
+ .kiwi-network-name-options {
61
+ background-color: #4e5c6b;
62
+ }
63
+ .kiwi-statebrowser-channelfilter p a:hover {
64
+ color: #fff;
65
+ }
66
+
67
+ /* Sidebar */
68
+ .kiwi-userbox .kiwi-userbox-actions .kiwi-userbox-action {
69
+ border-color: var(--brand-primary);
70
+ color: var(--brand-primary);
71
+ }
72
+
73
+ .kiwi-userbox .kiwi-userbox-actions .kiwi-userbox-action:hover {
74
+ color: var(--brand-default-bg);
75
+ background-color: var(--brand-primary);
76
+ }
77
+
78
+ .kiwi-statebrowser-network-status a {
79
+ color: var(--brand-default-bg);
80
+ }
81
+
82
+ /* IRC Text Colours */
83
+ .irc-fg-colour-white { color: #fff; }
84
+ .irc-fg-colour-black { color: #000; }
85
+ .irc-fg-colour-blue { color: #00f; }
86
+ .irc-fg-colour-green { color: #009300; }
87
+ .irc-fg-colour-light-red { color: #ff5959; }
88
+ .irc-fg-colour-brown { color: #743a00; }
89
+ .irc-fg-colour-purple { color: #a500ff; }
90
+ .irc-fg-colour-orange { color: #ff8c00; }
91
+ .irc-fg-colour-yellow { color: #ff0; }
92
+ .irc-fg-colour-light-green { color: #6fff6f; }
93
+ .irc-fg-colour-cyan { color: #0cc; }
94
+ .irc-fg-colour-light-cyan { color: #6dffff; }
95
+ .irc-fg-colour-light-blue { color: #59b4ff; }
96
+ .irc-fg-colour-pink { color: #f0f; }
97
+ .irc-fg-colour-grey { color: #a6a6a6; }
98
+ .irc-fg-colour-light-grey { color: #e2e2e2; }
99
+
100
+ .irc-bg-colour-white { background-color: #fff; }
101
+ .irc-bg-colour-black { background-color: #000; }
102
+ .irc-bg-colour-blue { background-color: #00f; }
103
+ .irc-bg-colour-green { background-color: #009300; }
104
+ .irc-bg-colour-light-red { background-color: #ff5959; }
105
+ .irc-bg-colour-brown { background-color: #743a00; }
106
+ .irc-bg-colour-purple { background-color: #a500ff; }
107
+ .irc-bg-colour-orange { background-color: #ff8c00; }
108
+ .irc-bg-colour-yellow { background-color: #ff0; }
109
+ .irc-bg-colour-light-green { background-color: #6fff6f; }
110
+ .irc-bg-colour-cyan { background-color: #0cc; }
111
+ .irc-bg-colour-light-cyan { background-color: #6dffff; }
112
+ .irc-bg-colour-light-blue { background-color: #59b4ff; }
113
+ .irc-bg-colour-pink { background-color: #f0f; }
114
+ .irc-bg-colour-grey { background-color: #a6a6a6; }
115
+ .irc-bg-colour-light-grey { background-color: #e2e2e2; }