instbyte 1.9.1 → 1.9.3

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "instbyte",
-  "version": "1.9.1",
+  "version": "1.9.3",
   "description": "A self-hosted LAN sharing utility for fast, frictionless file, link, and snippet exchange across devices — no cloud required.",
-  "main": "server/server.js",
+  "main": "bin/instbyte.js",
   "bin": {
     "instbyte": "bin/instbyte.js"
   },
@@ -12,8 +12,10 @@
     "client/"
   ],
   "scripts": {
-    "start": "node server/server.js",
-    "dev": "nodemon server/server.js"
+    "start": "node bin/instbyte.js",
+    "dev": "nodemon bin/instbyte.js",
+    "test": "vitest run",
+    "test:watch": "vitest"
   },
   "keywords": [
     "lan",
@@ -44,5 +46,10 @@
     "sharp": "^0.33.2",
     "socket.io": "^4.6.1",
     "sqlite3": "^5.1.6"
+  },
+  "devDependencies": {
+    "nodemon": "^3.1.0",
+    "supertest": "^7.2.2",
+    "vitest": "^2.1.8"
   }
 }

package/server/cleanup.js

@@ -1,26 +1,27 @@
-const db = require("./db");
-const fs = require("fs");
-const path = require("path");
-const config = require("./config");
-
-setInterval(() => {
-  if (config.storage.retention === null) return;
-  const cutoff = Date.now() - config.storage.retention;
-
-  db.all(
-    `SELECT * FROM items WHERE created_at < ? AND pinned = 0`,
-    [cutoff],
-    (err, rows) => {
-      rows.forEach((item) => {
-        if (item.filename) {
-          const uploadsDir = process.env.INSTBYTE_UPLOADS
-            || path.join(__dirname, "../uploads");
-          const filePath = path.join(uploadsDir, item.filename);
-          if (fs.existsSync(filePath)) fs.unlinkSync(filePath);
-        }
-
-        db.run(`DELETE FROM items WHERE id=?`, [item.id]);
-      });
-    }
-  );
-}, 10 * 60 * 1000);
+const db = require("./db");
+const fs = require("fs");
+const path = require("path");
+const config = require("./config");
+
+setInterval(() => {
+  if (config.storage.retention === null) return;
+  const cutoff = Date.now() - config.storage.retention;
+
+  db.all(
+    `SELECT * FROM items WHERE created_at < ? AND pinned = 0`,
+    [cutoff],
+    (err, rows) => {
+      if (err || !rows) return;
+      rows.forEach((item) => {
+        if (item.filename) {
+          const uploadsDir = process.env.INSTBYTE_UPLOADS
+            || path.join(__dirname, "../uploads");
+          const filePath = path.join(uploadsDir, item.filename);
+          if (fs.existsSync(filePath)) fs.unlinkSync(filePath);
+        }
+
+        db.run(`DELETE FROM items WHERE id=?`, [item.id]);
+      });
+    }
+  );
+}, 10 * 60 * 1000);

package/server/config.js

@@ -1,70 +1,70 @@
-const fs = require("fs");
-const path = require("path");
-
-// These are the defaults — what you get with zero config file
-const defaults = {
-    server: {
-        port: 3000,
-    },
-    auth: {
-        passphrase: ""        // empty = no password required
-    },
-    storage: {
-        maxFileSize: 2 * 1024 * 1024 * 1024,  // 2GB in bytes
-        retention: 24 * 60 * 60 * 1000,        // 24 hours in ms
-    },
-    branding: {
-        appName: "Instbyte",
-        logoPath: "",
-        faviconPath: "",
-        primaryColor: "#111827"
-    }
-};
-
-function parseFileSize(val) {
-    if (typeof val === "number") return val;
-    const units = { KB: 1024, MB: 1024 ** 2, GB: 1024 ** 3 };
-    const match = String(val).match(/^(\d+(\.\d+)?)\s*(KB|MB|GB)$/i);
-    if (!match) return defaults.storage.maxFileSize;
-    return parseFloat(match[1]) * units[match[3].toUpperCase()];
-}
-
-function parseRetention(val) {
-    if (String(val).toLowerCase() === "never") return null;
-    if (typeof val === "number") return val;
-    const units = { h: 3600000, d: 86400000 };
-    const match = String(val).match(/^(\d+)(h|d)$/i);
-    if (!match) return defaults.storage.retention;
-    return parseInt(match[1]) * units[match[2].toLowerCase()];
-}
-
-function loadConfig() {
-    const configPath = path.join(process.cwd(), "instbyte.config.json");
-    let userConfig = {};
-
-    if (fs.existsSync(configPath)) {
-        try {
-            const raw = fs.readFileSync(configPath, "utf-8");
-            userConfig = JSON.parse(raw);
-            console.log("Config loaded from instbyte.config.json");
-        } catch (e) {
-            console.warn("Warning: instbyte.config.json is invalid JSON, using defaults.");
-        }
-    }
-
-    // Deep merge user config over defaults
-    const config = {
-        server: { ...defaults.server, ...(userConfig.server || {}) },
-        auth: { ...defaults.auth, ...(userConfig.auth || {}) },
-        storage: { ...defaults.storage, ...(userConfig.storage || {}) },
-        branding: { ...defaults.branding, ...(userConfig.branding || {}) }
-    };
-
-    // Parse human-readable values like "500MB" or "48h"
-    config.storage.maxFileSize = parseFileSize(config.storage.maxFileSize);
-    config.storage.retention = parseRetention(config.storage.retention);
-
-    return config;
-}
-
+const fs = require("fs");
+const path = require("path");
+
+// These are the defaults — what you get with zero config file
+const defaults = {
+    server: {
+        port: 3000,
+    },
+    auth: {
+        passphrase: ""        // empty = no password required
+    },
+    storage: {
+        maxFileSize: 2 * 1024 * 1024 * 1024,  // 2GB in bytes
+        retention: 24 * 60 * 60 * 1000,        // 24 hours in ms
+    },
+    branding: {
+        appName: "Instbyte",
+        logoPath: "",
+        faviconPath: "",
+        primaryColor: "#111827"
+    }
+};
+
+function parseFileSize(val) {
+    if (typeof val === "number") return val;
+    const units = { KB: 1024, MB: 1024 ** 2, GB: 1024 ** 3 };
+    const match = String(val).match(/^(\d+(\.\d+)?)\s*(KB|MB|GB)$/i);
+    if (!match) return defaults.storage.maxFileSize;
+    return parseFloat(match[1]) * units[match[3].toUpperCase()];
+}
+
+function parseRetention(val) {
+    if (String(val).toLowerCase() === "never") return null;
+    if (typeof val === "number") return val;
+    const units = { h: 3600000, d: 86400000 };
+    const match = String(val).match(/^(\d+)(h|d)$/i);
+    if (!match) return defaults.storage.retention;
+    return parseInt(match[1]) * units[match[2].toLowerCase()];
+}
+
+function loadConfig() {
+    const configPath = path.join(process.cwd(), "instbyte.config.json");
+    let userConfig = {};
+
+    if (fs.existsSync(configPath)) {
+        try {
+            const raw = fs.readFileSync(configPath, "utf-8");
+            userConfig = JSON.parse(raw);
+            console.log("Config loaded from instbyte.config.json");
+        } catch (e) {
+            console.warn("Warning: instbyte.config.json is invalid JSON, using defaults.");
+        }
+    }
+
+    // Deep merge user config over defaults
+    const config = {
+        server: { ...defaults.server, ...(userConfig.server || {}) },
+        auth: { ...defaults.auth, ...(userConfig.auth || {}) },
+        storage: { ...defaults.storage, ...(userConfig.storage || {}) },
+        branding: { ...defaults.branding, ...(userConfig.branding || {}) }
+    };
+
+    // Parse human-readable values like "500MB" or "48h"
+    config.storage.maxFileSize = parseFileSize(config.storage.maxFileSize);
+    config.storage.retention = parseRetention(config.storage.retention);
+
+    return config;
+}
+
 module.exports = loadConfig();

package/server/db.js

@@ -1,60 +1,60 @@
-const sqlite3 = require("sqlite3").verbose();
-const path = require("path");
-
-const dbPath = process.env.INSTBYTE_DATA
-  ? path.join(process.env.INSTBYTE_DATA, "db.sqlite")
-  : path.join(__dirname, "../db.sqlite");
-
-const db = new sqlite3.Database(dbPath);
-db.configure("busyTimeout", 5000);
-
-db.serialize(() => {
-
-  // ITEMS TABLE
-  db.run(`
-    CREATE TABLE IF NOT EXISTS items (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      type TEXT,
-      content TEXT,
-      filename TEXT,
-      size INTEGER DEFAULT 0,
-      channel TEXT,
-      uploader TEXT,
-      pinned INTEGER DEFAULT 0,
-      created_at INTEGER
-    )
-  `);
-
-  // CHANNELS TABLE
-  db.run(`
-    CREATE TABLE IF NOT EXISTS channels (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      name TEXT UNIQUE,
-      pinned INTEGER DEFAULT 0
-    )
-  `);
-
-  db.run(`ALTER TABLE items ADD COLUMN size INTEGER DEFAULT 0`, () => { });
-  db.run(`ALTER TABLE channels ADD COLUMN pinned INTEGER DEFAULT 0`, () => { });
-
-  db.run(`ALTER TABLE items ADD COLUMN title TEXT DEFAULT ''`, () => { });
-  db.run(`ALTER TABLE items ADD COLUMN edited_at INTEGER DEFAULT NULL`, () => { });
-
-  // Insert default channels if empty
-  db.get("SELECT COUNT(*) as count FROM channels", (err, row) => {
-    if (err) {
-      console.error("Channel count error:", err);
-      return;
-    }
-
-    if (row.count === 0) {
-      const defaults = ["general", "projects", "assets", "temp"];
-      defaults.forEach(name => {
-        db.run("INSERT INTO channels (name) VALUES (?)", [name]);
-      });
-    }
-  });
-
-});
-
-module.exports = db;
+const sqlite3 = require("sqlite3").verbose();
+const path = require("path");
+
+const dbPath = process.env.INSTBYTE_DATA
+  ? path.join(process.env.INSTBYTE_DATA, "db.sqlite")
+  : path.join(__dirname, "../db.sqlite");
+
+const db = new sqlite3.Database(dbPath);
+db.configure("busyTimeout", 5000);
+
+db.serialize(() => {
+
+  // ITEMS TABLE
+  db.run(`
+    CREATE TABLE IF NOT EXISTS items (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      type TEXT,
+      content TEXT,
+      filename TEXT,
+      size INTEGER DEFAULT 0,
+      channel TEXT,
+      uploader TEXT,
+      pinned INTEGER DEFAULT 0,
+      created_at INTEGER
+    )
+  `);
+
+  // CHANNELS TABLE
+  db.run(`
+    CREATE TABLE IF NOT EXISTS channels (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      name TEXT UNIQUE,
+      pinned INTEGER DEFAULT 0
+    )
+  `);
+
+  db.run(`ALTER TABLE items ADD COLUMN size INTEGER DEFAULT 0`, () => { });
+  db.run(`ALTER TABLE channels ADD COLUMN pinned INTEGER DEFAULT 0`, () => { });
+
+  db.run(`ALTER TABLE items ADD COLUMN title TEXT DEFAULT ''`, () => { });
+  db.run(`ALTER TABLE items ADD COLUMN edited_at INTEGER DEFAULT NULL`, () => { });
+
+  // Insert default channels if empty
+  db.get("SELECT COUNT(*) as count FROM channels", (err, row) => {
+    if (err) {
+      console.error("Channel count error:", err);
+      return;
+    }
+
+    if (row.count === 0) {
+      const defaults = ["general", "projects", "assets", "temp"];
+      defaults.forEach(name => {
+        db.run("INSERT INTO channels (name) VALUES (?)", [name]);
+      });
+    }
+  });
+
+});
+
+module.exports = db;