Compare commits

...

4 commits

Author SHA1 Message Date
Ty
abfa9697b1
Update to new doipjs fork 2024-06-14 23:20:19 -06:00
Tyler Beckman
353cd3b1e5
Update lockfile 2024-06-14 17:34:25 -06:00
Tyler Beckman
7b5aa4703a
Merge upstream 2024-06-02 10:26:32 -06:00
Ty
d34d3027ee
Update to yarn modern, patch doip for SASL auth 2023-08-03 21:09:21 -06:00
6 changed files with 8188 additions and 5581 deletions

9
.gitignore vendored
View file

@ -34,3 +34,12 @@ ignore
dist dist
static static
logs logs
# yarn
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions

4
.yarnrc.yml Normal file
View file

@ -0,0 +1,4 @@
nodeLinker: node-modules
npmScopes:
myriation:
npmRegistryServer: https://git.myriation.xyz/api/packages/myriation/npm/

View file

@ -3,9 +3,9 @@ FROM node:20-alpine as builder
WORKDIR /app WORKDIR /app
COPY . . COPY . .
RUN yarn --pure-lockfile RUN corepack enable
RUN yarn run build:server RUN yarn install --immutable
RUN yarn run build:static RUN yarn run build:server && yarn run build:static
### ###

View file

@ -4,12 +4,13 @@
"description": "Verifying online identity with cryptography", "description": "Verifying online identity with cryptography",
"main": "./src/index.js", "main": "./src/index.js",
"type": "module", "type": "module",
"packageManager": "yarn@3.6.1",
"dependencies": { "dependencies": {
"ajv": "^8.6.3", "ajv": "^8.6.3",
"bent": "^7.3.12", "bent": "^7.3.12",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"colorjs.io": "^0.4.5", "colorjs.io": "^0.4.5",
"doipjs": "^1.2.9", "doipjs": "npm:@myriation/doipjs@1.2.9+myriation.1",
"dotenv": "^16.0.3", "dotenv": "^16.0.3",
"express": "^4.17.1", "express": "^4.17.1",
"express-http-context2": "^1.0.0", "express-http-context2": "^1.0.0",

View file

@ -42,7 +42,12 @@ const opts = {
privateKey: process.env.ACTIVITYPUB_PRIVATE_KEY || null privateKey: process.env.ACTIVITYPUB_PRIVATE_KEY || null
}, },
irc: { irc: {
nick: process.env.IRC_NICK || null nick: process.env.IRC_NICK || null,
sasl: Object.keys(process.env).filter(k => k.startsWith('IRC_SASL_USERNAME_')).map(k => ({
username: process.env[k],
password: process.env[`IRC_SASL_PASSWORD_${k.substring('IRC_SASL_USERNAME_'.length)}`],
domainRegex: process.env[`IRC_SASL_DOMAIN_REGEX_${k.substring('IRC_SASL_USERNAME_'.length)}`]
}))
}, },
matrix: { matrix: {
instance: process.env.MATRIX_INSTANCE || null, instance: process.env.MATRIX_INSTANCE || null,

13738
yarn.lock

File diff suppressed because it is too large Load diff