@inner-dj/server 0.2.2 → 0.2.3

package/lib/src/config.js

@@ -46,20 +46,20 @@ export async function getConfig(cfgPath) {
     const cfg = await parseConfig(p);
     const pub = getBoolean('PUBLIC', cfg, 'public', false);
     return {
-        port: notStupidParseInt(process.env['PORT'] ?? cfg.port ?? 8080),
-        trustProxy: joinIfArray(process.env['TRUSTPROXY'] ?? cfg.trustProxy),
+        port: notStupidParseInt(process.env['PORT'] ?? cfg?.port ?? 8080),
+        trustProxy: joinIfArray(process.env['TRUSTPROXY'] ?? cfg?.trustProxy),
         secure: getBoolean('SECURE', cfg, 'secure', true),
         public: pub,
-        sessionSecret: process.env['SESSIONSECRET'] ?? cfg.sessionSecret ?? throwNewError('sessionSecret is required'),
-        userOtp: pub ? '' : (process.env['USEROTP'] ?? cfg.userOtp) || generateTotpSecret('userOtp'),
-        adminOtp: process.env['ADMINOTP'] ?? cfg.adminOtp ?? generateTotpSecret('adminOtp'),
-        cookieTTL: notStupidParseInt(process.env['COOKIETTL'] ?? cfg.cookieTTL ?? 1000 * 60 * 60 * 24 * 30),
-        jwtSecret: process.env['JWTSECRET'] ?? cfg.jwtSecret ?? throwNewError('jwtSecret is required'),
-        db: SessionStore.getConfig(path.dirname(p), cfg.db),
-        discord: InnerDJDiscordBot.getConfig(cfg.discord),
-        twilio: TwilioReceiver.getConfig(cfg.twilio),
-        cookies: process.env['COOKIES'] ?? cfg.cookies,
-        limiter: setDefaultLimits(cfg.limiter || {}),
+        sessionSecret: process.env['SESSIONSECRET'] ?? cfg?.sessionSecret ?? throwNewError('sessionSecret is required'),
+        userOtp: pub ? '' : (process.env['USEROTP'] ?? cfg?.userOtp) || generateTotpSecret('userOtp'),
+        adminOtp: process.env['ADMINOTP'] ?? cfg?.adminOtp ?? generateTotpSecret('adminOtp'),
+        cookieTTL: notStupidParseInt(process.env['COOKIETTL'] ?? cfg?.cookieTTL ?? 1000 * 60 * 60 * 24 * 30),
+        jwtSecret: process.env['JWTSECRET'] ?? cfg?.jwtSecret ?? throwNewError('jwtSecret is required'),
+        db: SessionStore.getConfig(path.dirname(p), cfg?.db),
+        discord: InnerDJDiscordBot.getConfig(cfg?.discord),
+        twilio: TwilioReceiver.getConfig(cfg?.twilio),
+        cookies: process.env['COOKIES'] ?? cfg?.cookies,
+        limiter: setDefaultLimits(cfg?.limiter || {}),
     };
 }
 //# sourceMappingURL=config.js.map

package/lib/src/receivers/ireceiver.d.ts

@@ -0,0 +1,17 @@
+import { type ServerConfig } from '../config.js';
+import { type Web } from '../web.js';
+export interface iReceiverConfig {
+    enabled: boolean;
+}
+export interface iReceiverStatic<T extends iReceiverConfig> {
+    new (config: ServerConfig, web: Web): iReceiver;
+    getConfig(cfg?: Partial<T>): T;
+}
+export declare abstract class iReceiver {
+    protected config: ServerConfig;
+    private web;
+    constructor(config: ServerConfig, web: Web);
+    request: (url: string) => Promise<boolean>;
+    start: () => void;
+    close: () => void;
+}

package/lib/src/receivers/ireceiver.js

@@ -0,0 +1,18 @@
+;
+export class iReceiver {
+    config;
+    web;
+    constructor(config, web) {
+        this.config = config;
+        this.web = web;
+    }
+    request = (url) => {
+        return this.web.sendPayload({
+            type: 'queue',
+            body: url
+        });
+    };
+    start = () => { };
+    close = () => { };
+}
+//# sourceMappingURL=ireceiver.js.map

package/lib/src/receivers/smtp-receiver.d.ts

@@ -0,0 +1,10 @@
+import { iReceiver, type iReceiverConfig } from './ireceiver.js';
+export interface SmtpReceiverConfig extends iReceiverConfig {
+    port: number;
+}
+export declare class SmtpReceiver extends iReceiver {
+    private smtp;
+    static getConfig(cfg?: Partial<SmtpReceiverConfig>): SmtpReceiverConfig;
+    start: () => void;
+    close: () => void;
+}

package/lib/src/receivers/smtp-receiver.js

@@ -0,0 +1,38 @@
+import { SMTPServer } from "smtp-server";
+import { notStupidParseInt } from 'inner-dj-common';
+import { iReceiver } from './ireceiver.js';
+import { getBoolean } from '../config.js';
+export class SmtpReceiver extends iReceiver {
+    smtp = null;
+    static getConfig(cfg) {
+        return {
+            enabled: getBoolean('SMTPENABLED', cfg, 'enabled', false),
+            port: notStupidParseInt(process.env['SMTPPORT'] ?? cfg?.port ?? 4650),
+        };
+    }
+    start = () => {
+        if (this.smtp) {
+            return;
+        }
+        const server = this.smtp = new SMTPServer({
+            secure: true,
+            name: 'Inner DJ request inbox',
+            size: 255,
+            authOptional: false,
+            disabledCommands: ['AUTH'],
+            onData: (stream, _session, callback) => {
+                const body = stream.read();
+                console.log(body);
+                callback(null, "Message queued");
+            }
+        });
+        server.listen(this.config.smtpConfig.port);
+        console.log(`SmtpReceiver listening on port ${this.config.smtpConfig.port}`);
+    };
+    close = () => {
+        this.smtp?.close();
+        this.smtp = null;
+    };
+}
+SmtpReceiver;
+//# sourceMappingURL=smtp-receiver.js.map

package/lib/src/web.js

@@ -235,6 +235,15 @@ export class Web extends EventEmitter {
                 }
             });
         });
+        app.get('/about', (_, res) => {
+            res.render('about', {
+                page: {
+                    title: 'About Inner DJ',
+                    titlesuffix: 'Open Source Notice',
+                    description: 'Legal stuff'
+                }
+            });
+        });
         const requireAdmin = (req, res, next) => {
             if (req.session.admin !== true) {
                 res.redirect('/?override=1');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inner-dj/server",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "server component of inner-dj",
   "keywords": [
     "jukebox",
@@ -39,15 +39,16 @@
     "assets/",
     "views/",
     "lib/src",
-    "!lib/**/*.js.map"
+    "!lib/**/*.js.map",
+    "LICENSE"
   ],
   "dependencies": {
-    "better-sqlite3": "^12.10.0",
+    "better-sqlite3": "^13.0.3",
     "bulma": "^1.0.4",
     "content-disposition": "2.0.1",
     "ejs": "^6.0.1",
     "express": "^5.2.1",
-    "express-rate-limit": "^8.5.2",
+    "express-rate-limit": "^8.6.2",
     "express-session": "^1.19.0",
     "express-ws": "^5.0.2",
     "get-youtube-id-ng": "1.0.1",
@@ -55,13 +56,13 @@
     "otplib": "^13.4.1",
     "qr-creator": "^1.0.0",
     "yaml": "^2.9.0",
-    "@inner-dj/common": "0.2.0",
-    "@inner-dj/discord-receiver": "0.2.0",
-    "@inner-dj/twilio-receiver": "0.2.1"
+    "@inner-dj/common": "0.2.3",
+    "@inner-dj/discord-receiver": "0.2.3",
+    "@inner-dj/twilio-receiver": "0.2.3"
   },
   "devDependencies": {
     "@sindresorhus/tsconfig": "8.1.0",
-    "@types/better-sqlite3": "^7.6.13",
+    "@types/better-sqlite3": "^9.6.0",
     "@types/express": "^5.0.6",
     "@types/express-session": "^1.19.0",
     "@types/express-ws": "^3.0.6",
@@ -69,10 +70,12 @@
     "@types/node": "^24.12.4",
     "@types/ws": "^8.18.1",
     "forking-build-shit": "1.1.3",
+    "npm-attribution-generator": "^2.0.0",
     "typescript": "^7.0.2"
   },
   "scripts": {
-    "build": "tsc && chmod +x lib/src/main.js && cp node_modules/otplib/dist/index.global.js scripts/otplib.js && cp node_modules/qr-creator/dist/qr-creator.min.js scripts/ && build-shit",
+    "attribution": "generate-attribution && mv oss-attribution/attribution.txt ./views/attribution.ejs ; rm -rf ./oss-attribution",
+    "build": "tsc && chmod +x lib/src/main.js && cp node_modules/otplib/dist/index.global.js scripts/otplib.js && cp node_modules/qr-creator/dist/qr-creator.min.js scripts/ && build-shit && pnpm run attribution",
     "start": "./lib/src/main.js"
   }
 }

package/views/about.ejs

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+
+<head>
+    <%- include("head", locals) %>
+</head>
+
+<body class="preload">
+    <div class="mt-5">
+        <div class="container">
+            <h1 class="title is-1">About Inner DJ Web</h1>
+<pre>
+<%- include("attribution") %>
+</pre>
+        </div>
+    </div>
+</body>
+
+</html>