chore: moved first files to esm (#7061)

* chore: moved first files to esm

* chore: moved first files to esm

* chore: fix read only manager

Author: SamTV12345

pnpm-lock.yaml

@@ -26,7 +26,7 @@ import {Attribute} from "../../static/js/types/Attribute";
 const CustomError = require('../utils/customError');
 const padManager = require('./PadManager');
 const padMessageHandler = require('../handler/PadMessageHandler');
-const readOnlyManager = require('./ReadOnlyManager');
+import readOnlyManager from './ReadOnlyManager';
 const groupManager = require('./GroupManager');
 const authorManager = require('./AuthorManager');
 const sessionManager = require('./SessionManager');

src/node/db/API.ts

@@ -20,12 +20,11 @@ const padManager = require('./PadManager');
 const padMessageHandler = require('../handler/PadMessageHandler');
 const groupManager = require('./GroupManager');
 const CustomError = require('../utils/customError');
-const readOnlyManager = require('./ReadOnlyManager');
-const randomString = require('../utils/randomstring');
+import readOnlyManager from './ReadOnlyManager';
+import randomString from '../utils/randomstring';
 const hooks = require('../../static/js/pluginfw/hooks');
 import pad_utils from "../../static/js/pad_utils";
 import {SmartOpAssembler} from "../../static/js/SmartOpAssembler";
-import {} from '../utils/promises';
 import {timesLimit} from "async";
 
 /**

src/node/db/Pad.ts

@@ -21,22 +21,22 @@
 
 
 const db = require('./DB');
-const randomString = require('../utils/randomstring');
+import randomString from '../utils/randomstring';
 
 
 /**
  * checks if the id pattern matches a read-only pad id
  * @param {String} id the pad's id
  * @return {Boolean} true if the id is readonly
  */
-exports.isReadOnlyId = (id:string) => id.startsWith('r.');
+const isReadOnlyId = (id:string) => id.startsWith('r.');
 
 /**
  * returns a read only id for a pad
  * @param {String} padId the id of the pad
  * @return {String} the read only id
  */
-exports.getReadOnlyId = async (padId:string) => {
+const getReadOnlyId = async (padId:string) => {
   // check if there is a pad2readonly entry
   let readOnlyId = await db.get(`pad2readonly:${padId}`);
 
@@ -57,19 +57,29 @@ exports.getReadOnlyId = async (padId:string) => {
  * @param {String} readOnlyId read only id
  * @return {String} the padId
  */
-exports.getPadId = async (readOnlyId:string) => await db.get(`readonly2pad:${readOnlyId}`);
+const getPadId = async (readOnlyId:string) => await db.get(`readonly2pad:${readOnlyId}`);
 
 /**
  * returns the padId and readonlyPadId in an object for any id
  * @param {String} id read only id or real pad id
  * @return {Object} an object with the padId and readonlyPadId
  */
-exports.getIds = async (id:string) => {
-  const readonly = exports.isReadOnlyId(id);
+const getIds = async (id:string) => {
+  const readonly = isReadOnlyId(id);
 
   // Might be null, if this is an unknown read-only id
-  const readOnlyPadId = readonly ? id : await exports.getReadOnlyId(id);
-  const padId = readonly ? await exports.getPadId(id) : id;
+  const readOnlyPadId = readonly ? id : await getReadOnlyId(id);
+  const padId = readonly ? await getPadId(id) : id;
 
   return {readOnlyPadId, padId, readonly};
 };
+
+export default {
+  isReadOnlyId,
+  getReadOnlyId,
+  getPadId,
+  getIds,
+  // Export for testing purposes
+  __getReadOnlyId: getReadOnlyId, // eslint-disable-line no-underscore-dangle
+  __getPadId: getPadId, // eslint-disable-line no-underscore-dangle
+}

src/node/db/ReadOnlyManager.ts

@@ -24,7 +24,7 @@ import {UserSettingsObject} from "../types/UserSettingsObject";
 const authorManager = require('./AuthorManager');
 const hooks = require('../../static/js/pluginfw/hooks');
 const padManager = require('./PadManager');
-const readOnlyManager = require('./ReadOnlyManager');
+import readOnlyManager from './ReadOnlyManager';
 const sessionManager = require('./SessionManager');
 const settings = require('../utils/Settings');
 const webaccess = require('../hooks/express/webaccess');

src/node/db/SecurityManager.ts

@@ -22,7 +22,7 @@
 
 const CustomError = require('../utils/customError');
 import {firstSatisfies} from '../utils/promises';
-const randomString = require('../utils/randomstring');
+import randomString from '../utils/randomstring';
 const db = require('./DB');
 const groupManager = require('./GroupManager');
 const authorManager = require('./AuthorManager');

src/node/db/SessionManager.ts

@@ -1,7 +1,7 @@
 const absolutePaths = require('../utils/AbsolutePaths');
 import fs from 'fs';
 import log4js from 'log4js';
-const randomString = require('../utils/randomstring');
+import randomString from '../utils/randomstring';
 const argv = require('../utils/Cli').argv;
 const settings = require('../utils/Settings');
 

src/node/handler/APIKeyHandler.ts

@@ -29,7 +29,7 @@ import AttributePool from '../../static/js/AttributePool';
 const AttributeManager = require('../../static/js/AttributeManager');
 const authorManager = require('../db/AuthorManager');
 import padutils from '../../static/js/pad_utils';
-const readOnlyManager = require('../db/ReadOnlyManager');
+import readOnlyManager from '../db/ReadOnlyManager';
 const settings = require('../utils/Settings');
 const securityManager = require('../db/SecurityManager');
 const plugins = require('../../static/js/pluginfw/plugin_defs');

src/node/handler/PadMessageHandler.ts

@@ -2,18 +2,16 @@
 
 
 import {PadQueryResult, PadSearchQuery} from "../../types/PadSearchQuery";
-import {PadType} from "../../types/PadType";
 import log4js from 'log4js';
 
-const eejs = require('../../eejs');
 const fsp = require('fs').promises;
 const hooks = require('../../../static/js/pluginfw/hooks');
 const plugins = require('../../../static/js/pluginfw/plugins');
 const settings = require('../../utils/Settings');
-const UpdateCheck = require('../../utils/UpdateCheck');
+import {getLatestVersion} from '../../utils/UpdateCheck';
 const padManager = require('../../db/PadManager');
 const api = require('../../db/API');
-const cleanup = require('../../utils/Cleanup');
+import {deleteRevisions} from '../../utils/Cleanup';
 
 
 const queryPadLimit = 12;
@@ -100,7 +98,7 @@ exports.socketio = (hookName: string, {io}: any) => {
                 installedParts: plugins.getParts(),
                 installedServerHooks: mapToObject(hooks),
                 installedClientHooks: mapToObject(clientHooks),
-                latestVersion: UpdateCheck.getLatestVersion(),
+                latestVersion: getLatestVersion(),
             })
         });
 
@@ -265,7 +263,7 @@ exports.socketio = (hookName: string, {io}: any) => {
           if (padExists) {
             logger.info(`Cleanup pad revisions: ${padId}`);
             try {
-              const result = await cleanup.deleteRevisions(padId, settings.cleanup.keepRevisions)
+              const result = await deleteRevisions(padId, settings.cleanup.keepRevisions)
               if (result) {
                 socket.emit('results:cleanupPadRevisions', {
                   padId: padId,

src/node/hooks/express/adminsettings.ts

@@ -7,7 +7,7 @@ const settings = require('../../utils/Settings');
 const exportHandler = require('../../handler/ExportHandler');
 const importHandler = require('../../handler/ImportHandler');
 const padManager = require('../../db/PadManager');
-const readOnlyManager = require('../../db/ReadOnlyManager');
+import readOnlyManager from '../../db/ReadOnlyManager';
 const rateLimit = require('express-rate-limit');
 const securityManager = require('../../db/SecurityManager');
 const webaccess = require('./webaccess');