start work on 1.2.2

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "monofile",
-  "version": "1.1.4",
+  "version": "1.2.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "monofile",
-      "version": "1.1.4",
+      "version": "1.2.1",
       "license": "Unlicense",
       "dependencies": {
         "@types/body-parser": "^1.19.2",
@@ -21,7 +21,7 @@
         "typescript": "^4.8.3"
       },
       "engines": {
-        "node": ">=v16"
+        "node": ">=v16.9.0"
       }
     },
     "node_modules/@discordjs/builders": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "monofile",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Discord-based file sharing",
   "main": "index.js",
   "scripts": {

src/index.ts

@@ -9,7 +9,9 @@ import express from "express"
 import fs from "fs"
 import axios, { AxiosResponse } from "axios"
 
+import Files from "./lib/files"
 require('dotenv').config()
+
 let pkg = require(`${process.cwd()}/package.json`)
 
 let app = express()
@@ -49,66 +51,6 @@ let client = new Client({intents:[
 
 let uploadChannel:Discord.TextBasedChannel
 
-interface FileUploadSettings {
-    name?: string,
-    mime: string,
-    uploadId?: string
-}
-
-let uploadFile = (settings:FileUploadSettings,fBuffer:Buffer) => {
-    return new Promise<string>(async (resolve,reject) => {
-        if (!settings.name || !settings.mime) {reject({status:400,message:"missing name/mime"});return}
-
-        let uploadId = (settings.uploadId || Math.random().toString().slice(2)).toString();
-
-        if ((uploadId.match(/[A-Za-z0-9_\-\.]+/)||[])[0] != uploadId || uploadId.length > 30) {reject({status:400,message:"invalid id"});return}
-        
-        if (files[uploadId]) {reject({status:400,message:"a file with this id already exists"});return}
-        if (settings.name.length > 128) {reject({status:400,message:"name too long"}); return}
-        if (settings.name.length > 128) {reject({status:400,message:"mime too long"}); return}
-
-        // get buffer
-        if (fBuffer.byteLength >= (config.maxDiscordFileSize*config.maxDiscordFiles)) {reject({status:400,message:"file too large"}); return}
-        
-        // generate buffers to upload
-        let toUpload = []
-        for (let i = 0; i < Math.ceil(fBuffer.byteLength/config.maxDiscordFileSize); i++) {
-            toUpload.push(fBuffer.subarray(i*config.maxDiscordFileSize,Math.min(fBuffer.byteLength,(i+1)*config.maxDiscordFileSize)))
-        }
-
-        // begin uploading
-        let uploadTmplt:Discord.AttachmentBuilder[] = toUpload.map((e) => {return new Discord.AttachmentBuilder(e).setName(Math.random().toString().slice(2))})
-        let uploadGroups = []
-        for (let i = 0; i < Math.ceil(uploadTmplt.length/10); i++) {
-            uploadGroups.push(uploadTmplt.slice(i*10,((i+1)*10)))
-        }
-
-        let msgIds = []
-
-        for (let i = 0; i < uploadGroups.length; i++) {
-            let ms = await uploadChannel.send({files:uploadGroups[i]}).catch((e) => {console.error(e)})
-            if (ms) {
-                msgIds.push(ms.id)
-            } else {
-                reject({status:500,message:"please try again"}); return
-            }
-        }
-
-        // save
-
-        files[uploadId] = {
-            filename:settings.name,
-            messageids:msgIds,
-            mime:settings.mime
-        }
-
-        fs.writeFile(__dirname+"/../.data/files.json",JSON.stringify(files),(err) => {
-            if (err) {reject({status:500,message:"please try again"}); delete files[uploadId];return}
-            resolve(uploadId)    
-        })
-    })
-}
-
 app.get("/", function(req,res) {
     fs.readFile(__dirname+"/../pages/base.html",(err,buf) => {
         if (err) {res.sendStatus(500);console.log(err);return}

src/lib/files.ts

@@ -0,0 +1,85 @@
+import { Client } from "discord.js";
+
+export interface FileUploadSettings {
+    name?: string,
+    mime: string,
+    uploadId?: string
+}
+
+export interface Configuration {
+    maxDiscordFiles: number,
+    maxDiscordFileSize: number,
+    targetGuild: string,
+    targetChannel: string,
+    requestTimeout: number
+}
+
+export default class Files {
+
+    config: Configuration
+    client: Client
+
+    constructor(client: Client, config: Configuration) {
+        this.config = config;
+        this.client = client;
+    }
+    
+    uploadFile(settings:FileUploadSettings,fBuffer:Buffer) {
+        return new Promise<string>(async (resolve,reject) => {
+            if (!settings.name || !settings.mime) {reject({status:400,message:"missing name/mime"});return}
+    
+            let uploadId = (settings.uploadId || Math.random().toString().slice(2)).toString();
+    
+            if ((uploadId.match(/[A-Za-z0-9_\-\.]+/)||[])[0] != uploadId || uploadId.length > 30) {reject({status:400,message:"invalid id"});return}
+            
+            if (files[uploadId]) {reject({status:400,message:"a file with this id already exists"});return}
+            if (settings.name.length > 128) {reject({status:400,message:"name too long"}); return}
+            if (settings.name.length > 128) {reject({status:400,message:"mime too long"}); return}
+    
+            // get buffer
+            if (fBuffer.byteLength >= (this.config.maxDiscordFileSize*this.config.maxDiscordFiles)) {
+                reject({status:400,message:"file too large"}); 
+                return
+            }
+            
+            // generate buffers to upload
+            let toUpload = []
+            for (let i = 0; i < Math.ceil(fBuffer.byteLength/config.maxDiscordFileSize); i++) {
+                toUpload.push(fBuffer.subarray(i*config.maxDiscordFileSize,Math.min(fBuffer.byteLength,(i+1)*config.maxDiscordFileSize)))
+            }
+    
+            // begin uploading
+            let uploadTmplt:Discord.AttachmentBuilder[] = toUpload.map((e) => {return new Discord.AttachmentBuilder(e).setName(Math.random().toString().slice(2))})
+            let uploadGroups = []
+            for (let i = 0; i < Math.ceil(uploadTmplt.length/10); i++) {
+                uploadGroups.push(uploadTmplt.slice(i*10,((i+1)*10)))
+            }
+    
+            let msgIds = []
+    
+            for (let i = 0; i < uploadGroups.length; i++) {
+                let ms = await uploadChannel.send({files:uploadGroups[i]}).catch((e) => {console.error(e)})
+                if (ms) {
+                    msgIds.push(ms.id)
+                } else {
+                    reject({status:500,message:"please try again"}); return
+                }
+            }
+    
+            // save
+    
+            files[uploadId] = {
+                filename:settings.name,
+                messageids:msgIds,
+                mime:settings.mime
+            }
+    
+            fs.writeFile(__dirname+"/../.data/files.json",JSON.stringify(files),(err) => {
+                if (err) {reject({status:500,message:"please try again"}); delete files[uploadId];return}
+                resolve(uploadId)    
+            })
+        })
+    }
+    
+
+}