Added licence notice to many files, other minor type fixes

src/utils/actions.ts

@@ -1,5 +1,6 @@
 /* ----------------------------------------------------------------------------
-Question Server
+
+ Question Server
  GitLab: <https://gitlab.com/MrFry/mrfrys-node-server>
 
  This program is free software: you can redistribute it and/or modify
@@ -437,7 +438,7 @@ export function backupData(questionDbs: Array<QuestionDb>): void {
       logger.Log(`Backing up ${data.name}...`)
       writeData(
         data.data,
-        `${path}${data.name}_${utils.GetDateString(true)}.json`
+        `${path}${data.name}_${utils.GetDateString(undefined, true)}.json`
       )
       logger.Log('Done')
     } catch (err) {

src/utils/classes.ts

@@ -1,4 +1,23 @@
-// import os from 'os'
+/* ----------------------------------------------------------------------------
+
+ Question Server
+ GitLab: <https://gitlab.com/MrFry/mrfrys-node-server>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+ ------------------------------------------------------------------------- */
+
 import { isMainThread, parentPort, workerData } from 'worker_threads'
 
 import logger from './logger'
@@ -13,7 +32,7 @@ import { editDb, Edits } from './actions'
 export interface WorkerResult {
   msg: string
   workerIndex: number
-  result: SearchResultQuestion[]
+  result?: SearchResultQuestion[]
 }
 
 interface DetailedMatch {
@@ -557,7 +576,7 @@ function doSearch(
 function setNoPossibleAnswersPenalties(
   possibleAnswers: QuestionData['possibleAnswers'],
   result: SearchResultQuestion[]
-): any {
+): SearchResultQuestion[] {
   if (!Array.isArray(possibleAnswers)) {
     return result
   }
@@ -605,9 +624,6 @@ interface WorkData {
 }
 
 if (!isMainThread) {
-  // os.setPriority(10)
-  // logger.Log(`Worker thread priority set to ${os.getPriority()}`)
-
   const {
     workerIndex,
     initData,

src/utils/dbtools.ts

@@ -1,3 +1,23 @@
+/* ----------------------------------------------------------------------------
+
+ Question Server
+ GitLab: <https://gitlab.com/MrFry/mrfrys-node-server>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+ ------------------------------------------------------------------------- */
+
 // https://www.sqlitetutorial.net/sqlite-nodejs/
 // https://github.com/JoshuaWise/better-sqlite3/blob/HEAD/docs/api.md
 

src/utils/logger.ts

@@ -106,18 +106,6 @@ function LogReq(
   statusCode?: string | number
 ): void {
   try {
-    const ip: any =
-      req.headers['cf-connecting-ip'] || req.connection.remoteAddress
-    // if (!toFile) {
-    //   ip = expandWithSpaces(ip, 39)
-    // }
-    const nolog = noLogips.some((noLogip) => {
-      return ip.includes(noLogip)
-    })
-    if (nolog) {
-      return
-    }
-
     let logEntry = '' // logHashed(ip)
     let dl = DELIM
     if (req.url.includes('lred')) {

src/utils/utils.ts

@@ -1,3 +1,23 @@
+/* ----------------------------------------------------------------------------
+
+ Question Server
+ GitLab: <https://gitlab.com/MrFry/mrfrys-node-server>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+ ------------------------------------------------------------------------- */
+
 export default {
   ReadFile: ReadFile,
   ReadJSON: ReadJSON,
@@ -24,7 +44,7 @@ import { Request } from '../types/basicTypes'
 
 interface URLFormatOptions {
   pathname?: string
-  query?: any
+  query?: { [key: string]: string }
 }
 
 function formatUrl(options: URLFormatOptions): string {
@@ -42,8 +62,11 @@ function formatUrl(options: URLFormatOptions): string {
   return path + queryString
 }
 
-function GetDateString(noTime?: boolean): string {
-  const date = new Date()
+function GetDateString(
+  referenceDate?: Date | string,
+  noTime?: boolean
+): string {
+  const date = referenceDate ? new Date(referenceDate) : new Date()
 
   if (noTime) {
     return (
@@ -183,7 +206,14 @@ function deleteFile(fname: string): Boolean {
   return false
 }
 
-function uploadFile(req: Request, path: string): Promise<any> {
+function uploadFile(
+  req: Request,
+  path: string
+): Promise<{
+  body: Request['body']
+  fileName: string
+  filePath: string
+}> {
   return new Promise((resolve, reject) => {
     try {
       if (!req.files) {
@@ -235,7 +265,7 @@ function uploadFile(req: Request, path: string): Promise<any> {
   })
 }
 
-function statFile(file: string): any {
+function statFile(file: string): fs.Stats {
   if (FileExists(file)) {
     return fs.statSync(file)
   } else {
@@ -243,7 +273,7 @@ function statFile(file: string): any {
   }
 }
 
-function renameFile(oldPath: string, newPath: string): any {
+function renameFile(oldPath: string, newPath: string): string {
   if (FileExists(oldPath)) {
     fs.renameSync(oldPath, newPath)
     return newPath

src/utils/workerPool.ts

@@ -1,10 +1,30 @@
+/* ----------------------------------------------------------------------------
+
+ Question Server
+ GitLab: <https://gitlab.com/MrFry/mrfrys-node-server>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+ ------------------------------------------------------------------------- */
+
 import { Worker } from 'worker_threads'
 import { v4 as uuidv4 } from 'uuid'
 import { EventEmitter } from 'events'
 import os from 'os'
 
 import logger from './logger'
-import { Result } from './actions'
+import { Result, Edits } from './actions'
 import type { Question, QuestionDb, QuestionData } from '../types/basicTypes'
 import type { WorkerResult } from './classes'
 
@@ -27,7 +47,7 @@ interface TaskObject {
         searchTillMatchPercent?: number
         [key: string]: any
       }
-    | { dbIndex: number; edits: any }
+    | { dbIndex: number; edits: Edits }
     | QuestionDb
     | Result
 }
@@ -76,7 +96,7 @@ function handleWorkerError(worker: WorkerObj, err: Error) {
 }
 
 // TODO: accuire all workers here, and handle errors so they can be removed if threads exit
-export function msgAllWorker(data: TaskObject): Promise<any> {
+export function msgAllWorker(data: TaskObject): Promise<WorkerResult[]> {
   logger.DebugLog('MSGING ALL WORKER', 'job', 1)
   return new Promise((resolve) => {
     const promises: Promise<WorkerResult>[] = []
@@ -93,7 +113,7 @@ export function msgAllWorker(data: TaskObject): Promise<any> {
 export function doALongTask(
   obj: TaskObject,
   targetWorkerIndex?: number
-): Promise<any> {
+): Promise<WorkerResult> {
   if (Object.keys(pendingJobs).length > alertOnPendingCount) {
     logger.Log(
       `More than ${alertOnPendingCount} callers waiting for free resource! (${
@@ -120,7 +140,7 @@ export function doALongTask(
   })
 }
 
-export function initWorkerPool(initData: any): Array<WorkerObj> {
+export function initWorkerPool(initData: Array<QuestionDb>): Array<WorkerObj> {
   if (workers) {
     logger.Log('WORKERS ALREADY EXISTS', logger.GetColor('redbg'))
     return null
@@ -150,7 +170,6 @@ export function initWorkerPool(initData: any): Array<WorkerObj> {
 
 function processJob() {
   if (Object.keys(pendingJobs).length > 0) {
-    // FIXME: FIFO OR ANYTHING ELSE (JOB PROCESSING ORDER)
     const keys = Object.keys(pendingJobs)
     let jobKey: string, freeWorker: WorkerObj
     let i = 0
@@ -239,11 +258,18 @@ function doSomething(currWorker: WorkerObj, obj: TaskObject) {
   })
 }
 
-const workerTs = (file: string, wkOpts: any) => {
-  wkOpts.eval = true
-  if (!wkOpts.workerData) {
-    wkOpts.workerData = {}
+const workerTs = (
+  file: string,
+  wkOpts: {
+    workerData: {
+      workerIndex: number
+      initData: QuestionDb[]
+      __filename?: string
+    }
+    eval?: boolean
   }
+) => {
+  wkOpts.eval = true
   wkOpts.workerData.__filename = file
   return new Worker(
     `