clean: miscellaneous cleanups

KernelDeimos · KernelDeimos · commit 06aeae518bb0 · 2024-12-12T16:42:16.000-05:00
diff --git a/src/backend/src/services/AppInformationService.js b/src/backend/src/services/AppInformationService.js
@@ -185,8 +185,7 @@ class AppInformationService {
         const db = this.services.get('database').get(DB_READ, 'apps');
 
         let apps = await db.read('SELECT * FROM apps');
-        for (let index = 0; index < apps.length; index++) {
-            const app = apps[index];
+        for ( const app of apps ) {
             kv.set('apps:name:' + app.name, app);
             kv.set('apps:id:' + app.id, app);
             kv.set('apps:uid:' + app.uid, app);
@@ -249,9 +248,6 @@ class AppInformationService {
         const apps = await db.read(`SELECT uid, index_url FROM apps`);
 
         for ( const app of apps ) {
-            const sql =
-                `SELECT COUNT(id) AS referral_count FROM user WHERE referrer = ?`;
-
             const origin = origin_from_url(app.index_url);
 
             // only count the referral if the origin hashes to the app's uid
@@ -286,7 +282,6 @@ class AppInformationService {
     */
     async _refresh_recent_cache () {
         const app_keys = kv.keys(`apps:uid:*`);
-        // console.log('APP KEYS', app_keys);
 
         let apps = [];
         for ( const key of app_keys ) {
@@ -314,7 +309,6 @@ class AppInformationService {
     */
     async _refresh_tags () {
         const app_keys = kv.keys(`apps:uid:*`);
-        // console.log('APP KEYS', app_keys);
 
         let apps = [];
         for ( const key of app_keys ) {
diff --git a/src/backend/src/services/BootScriptService.js b/src/backend/src/services/BootScriptService.js
@@ -56,8 +56,7 @@ class BootScriptService extends BaseService {
             }
         };
 
-        for ( let i=0 ; i < boot_json.length ; i++ ) {
-            const statement = boot_json[i];
+        for ( const statement of boot_json ) {
             const [cmd, ...args] = statement;
             if ( ! scope[cmd] ) {
                 throw new Error(`Unknown command: ${cmd}`);
diff --git a/src/backend/src/services/CommentService.js b/src/backend/src/services/CommentService.js
@@ -66,9 +66,6 @@ class CommentService extends BaseService {
                     });
 
                     if ( req.body.version ) {
-                        // this.attach_comment_to_fsentry_version({
-                        //     node, comment, version,
-                        // });
                         res.status(400).send('not implemented yet');
                         return;
                     } else {
@@ -104,9 +101,6 @@ class CommentService extends BaseService {
                     });
 
                     if ( req.body.version ) {
-                        // this.attach_comment_to_fsentry_version({
-                        //     node, comment, version,
-                        // });
                         res.status(400).send('not implemented yet');
                         return;
                     } else {
diff --git a/src/backend/src/services/ConfigurableCountingService.js b/src/backend/src/services/ConfigurableCountingService.js
@@ -23,8 +23,8 @@ const { Context } = require("../util/context");
 const { DB_WRITE } = require('./database/consts');
 
 const hash = v => {
-    var sum = crypto.createHash('sha1');
-    sum.update('foo');
+    const sum = crypto.createHash('sha1');
+    sum.update(v);
     return sum.digest();
 }
 
diff --git a/src/backend/src/services/DevConsoleService.js b/src/backend/src/services/DevConsoleService.js
@@ -191,7 +191,6 @@ class DevConsoleService extends BaseService {
     */
     async _init () {
         const services = this.services;
-        // await services.ready;
         const commands = services.get('commands');
 
         const readline = require('readline');
@@ -223,7 +222,6 @@ class DevConsoleService extends BaseService {
                 await commands.executeRawCommand(input, console);
             }
             this._after_cmd();
-            // rl.prompt();
         });
 
 
@@ -354,26 +352,9 @@ class DevConsoleService extends BaseService {
         consoleLogManager.post_all(() => {
             this._post_write();
         })
-        // logService.loggers.unshift({
-        //     onLogMessage: () => {
-        //         rl.pause();
-        //         rl.output.write('\x1b[2K\r');
-        //     }
-        // });
-        // logService.loggers.push({
-        //     onLogMessage: () => {
-        //         rl.resume();
-        //         rl._refreshLine();
-        //     }
-        // });
 
         // This prevents the promptline background from staying
         // when Ctrl+C is used to terminate the server
-        /**
-         * Handles the SIGINT signal to gracefully terminate the server.
-         * This method ensures that the console output is reset and the process exits cleanly.
-         * It is triggered when the user presses Ctrl+C in the terminal.
-         */
         rl.on('SIGINT', () => {
             process.stdout.write(`\x1b[0m\r`);
             process.exit(0);
diff --git a/src/backend/src/services/DevTODService.js b/src/backend/src/services/DevTODService.js
@@ -112,7 +112,7 @@ class DevTODService extends BaseService {
                 ...random_tip,
             ];
             if ( ! this.global_config.minimal_console ) {
-                lines.unshift("\x1B[1mTip of the Day\x1B[0m"),
+                lines.unshift("\x1B[1mTip of the Day\x1B[0m");
                 lines.push("Type tod:dismiss to un-stick this message");
             }
             surrounding_box('33;1', lines);
diff --git a/src/backend/src/services/EventService.js b/src/backend/src/services/EventService.js
@@ -74,22 +74,9 @@ class EventService extends BaseService {
             // actual emit
             const listeners = this.listeners_[part];
             if ( ! listeners ) continue;
-            for ( let i = 0; i < listeners.length; i++ ) {
-                const callback = listeners[i];
-
+            for ( const callback of listeners ) {
                 // IIAFE wrapper to catch errors without blocking
                 // event dispatch.
-                /**
-                * IIAFE wrapper to handle emitting events asynchronously while catching errors.
-                * This method ensures that any errors thrown in the event listeners do not block
-                * the dispatching of other events.
-                * 
-                * @param {string} key - The event key to emit.
-                * @param {any} data - The data to be sent with the event.
-                * @param {Object} [meta={}] - Additional metadata for the event.
-                * 
-                * @returns {void}
-                */
                 Context.arun(async () => {
                     try {
                         await callback(key, data, meta);
diff --git a/src/backend/src/services/GetUserService.js b/src/backend/src/services/GetUserService.js
@@ -131,11 +131,6 @@ class GetUserService extends BaseService {
                     kv.set(`users:${prop}:${user[prop]}`, user);
                 }
             }
-            // kv.set('users:username:' + user.username, user);
-            // kv.set('users:email:' + user.email, user);
-            // kv.set('users:uuid:' + user.uuid, user);
-            // kv.set('users:id:' + user.id, user);
-            // kv.set('users:referral_code:' + user.referral_code, user);
         } catch (e) {
             console.error(e);
         }
diff --git a/src/backend/src/services/KernelInfoService.js b/src/backend/src/services/KernelInfoService.js
@@ -78,15 +78,12 @@ class KernelInfoService extends BaseService {
                 }
 
                 const services = [];
-                const modules = [];
                 for ( const k in this.services.modules_ ) {
                     const module_info = {
                         name: k,
                         services: []
                     };
                     
-                    modules.push(module_info);
-                    
                     for ( const s_k of this.services.modules_[k].services_l ) {
                         const service_info = {
                             name: s_k,
diff --git a/src/backend/src/services/PuterHomepageService.js b/src/backend/src/services/PuterHomepageService.js
@@ -163,8 +163,6 @@ class PuterHomepageService extends BaseService {
     }) {
         const require = this.require;
         const {encode} = require('html-entities');
-        const path_ = require('path');
-        const fs_ = require('fs');
 
         const e = encode;
 
@@ -175,7 +173,6 @@ class PuterHomepageService extends BaseService {
             company,
             canonical_url,
             social_media_image,
-            icon,
         } = meta;
 
         gui_params = {
@@ -190,7 +187,6 @@ class PuterHomepageService extends BaseService {
 
         const asset_dir = env === 'dev'
             ? '/src' : '/dist' ;
-        // const asset_dir = '/dist';
 
         gui_params.asset_dir = asset_dir;
 
@@ -209,12 +205,6 @@ class PuterHomepageService extends BaseService {
         // set social media image to default if it is not valid
         const social_media_image_url = social_media_image || `${asset_dir}/images/screenshot.png`;
 
-        const writeScriptTag = path =>
-            `<script type="${
-                Array.isArray(path) ? 'text/javascirpt' : 'module'
-            }" src="${Array.isArray(path) ? path[0] : path}"></script>\n`
-            ;
-
         return `<!DOCTYPE html>
     <html lang="en">
 
diff --git a/src/backend/src/services/ReferralCodeService.js b/src/backend/src/services/ReferralCodeService.js
@@ -23,7 +23,7 @@ const { Context } = require('../util/context');
 const { get_user } = require('../helpers');
 const { DB_WRITE } = require('./database/consts');
 const BaseService = require('./BaseService');
-const { UsernameNotifSelector, UserIDNotifSelector } = require('./NotificationService');
+const { UserIDNotifSelector } = require('./NotificationService');
 
 
 /**
@@ -112,7 +112,7 @@ class ReferralCodeService extends BaseService {
                 referral_code = generate_random_code(8, { rng });
             }
             try {
-                const update_res = db.write(`
+                db.write(`
                     UPDATE user SET referral_code=? WHERE id=?
                 `, [referral_code, user.id]);
                 return referral_code;
diff --git a/src/backend/src/services/ServeLandingService.js b/src/backend/src/services/ServeLandingService.js
diff --git a/src/backend/src/services/ShareService.js b/src/backend/src/services/ShareService.js
@@ -93,7 +93,6 @@ class ShareService extends BaseService {
                     user: issuer_user,
                 });
 
-                // const svc_permission = this.services.get('permission');
                 const svc_acl = this.services.get('acl');
 
                 for ( const permission of share.data.permissions ) {
diff --git a/src/backend/src/services/WSPushService.js b/src/backend/src/services/WSPushService.js
@@ -299,12 +299,6 @@ class WSPushService  extends BaseService {
 
         if ( ! socket_id ) {
             this.log.error('missing socket id', { metadata });
-
-            // TODO: this error is temporarily disabled for
-            // Puter V1 release, because it will cause a
-            // lot of redundant PagerDuty alerts.
-
-            // throw new Error('missing socket id');
         }
 
         this.log.info('socket id: ' + socket_id);
diff --git a/src/backend/src/services/auth/ACLService.js b/src/backend/src/services/auth/ACLService.js
@@ -248,11 +248,6 @@ class ACLService extends BaseService {
 
         const stat = await this.stat_user_user(issuer, holder, resource);
 
-        // this.log.info('stat object', {
-        //     stat,
-        //     path: await resource.get('path')
-        // });
-
         const perms_on_this = stat[await resource.get('path')] ?? [];
 
         const mode_parts = perms_on_this.map(perm => PermissionUtil.split(perm)[2]);
@@ -463,7 +458,6 @@ class ACLService extends BaseService {
 
         const svc_permission = await context.get('services').get('permission');
 
-        // const modes = this._higher_modes(mode);
         const modes = [mode];
         let perm_fsNode = fsNode;
         while ( ! await perm_fsNode.get('is-root') ) {
diff --git a/src/backend/src/services/auth/Actor.js b/src/backend/src/services/auth/Actor.js
@@ -140,20 +140,21 @@ class Actor extends AdvancedBase {
     }
 }
 
+class ActorType {
+    constructor (o) {
+        for ( const k in o ) {
+            this[k] = o[k];
+        }
+    }
+}
 
 /**
 * Class representing the system actor type within the actor framework.
 * This type serves as a specific implementation of an actor that 
 * represents a system-level entity and provides methods for UID retrieval 
 * and related type management.
 */
-class SystemActorType {
-    constructor (o, ...a) {
-        // super(o, ...a);
-        for ( const k in o ) {
-            this[k] = o[k];
-        }
-    }
+class SystemActorType extends ActorType {
     /**
      * Constructs a new instance of the actor type.
      * 
@@ -179,13 +180,7 @@ class SystemActorType {
 * specific to user actors. This class extends the base functionality to uniquely identify
 * user actors and define how they relate to other types of actors within the system.
 */
-class UserActorType {
-    constructor (o, ...a) {
-        // super(o, ...a);
-        for ( const k in o ) {
-            this[k] = o[k];
-        }
-    }
+class UserActorType extends ActorType {
     /**
     * Constructs a new UserActorType instance.
     * 
@@ -208,13 +203,7 @@ class UserActorType {
 * retrieving related actor types. It extends the base actor type functionality 
 * to cater to user-specific needs.
 */
-class AppUnderUserActorType {
-    constructor (o, ...a) {
-        // super(o, ...a);
-        for ( const k in o ) {
-            this[k] = o[k];
-        }
-    }
+class AppUnderUserActorType extends ActorType {
     /**
     * Create a new instance of the actor type, initializing it with the given parameters.
     * 
@@ -246,16 +235,11 @@ class AppUnderUserActorType {
 * An AccessTokenActorType associates an authorizer and an authorized actor 
 * with a string token, facilitating permission checks and identity management.
 */
-class AccessTokenActorType {
+class AccessTokenActorType extends ActorType {
     // authorizer: an Actor who authorized the token
     // authorized: an Actor who is authorized by the token
     // token: a string
-    constructor (o, ...a) {
-        // super(o, ...a);
-        for ( const k in o ) {
-            this[k] = o[k];
-        }
-    }
+
     /**
      * Constructs an instance of AccessTokenActorType.
      * This class represents an access token actor containing information 
diff --git a/src/backend/src/services/file-cache/FileCacheService.js b/src/backend/src/services/file-cache/FileCacheService.js
diff --git a/src/backend/src/services/sla/MonthlyUsageService.js b/src/backend/src/services/sla/MonthlyUsageService.js
diff --git a/src/backend/src/services/sla/RateLimitService.js b/src/backend/src/services/sla/RateLimitService.js
diff --git a/src/backend/src/services/thumbnails/HTTPThumbnailService.js b/src/backend/src/services/thumbnails/HTTPThumbnailService.js

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,7 @@ class BootScriptService extends BaseService {`
`56`	`56`	`}`
`57`	`57`	`};`
`58`	`58`
`59`		`- for ( let i=0 ; i < boot_json.length ; i++ ) {`
`60`		`- const statement = boot_json[i];`
	`59`	`+ for ( const statement of boot_json ) {`
`61`	`60`	`const [cmd, ...args] = statement;`
`62`	`61`	`if ( ! scope[cmd] ) {`
`63`	`62`	throw new Error(`Unknown command: ${cmd}`);
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ const { Context } = require("../util/context");`
`23`	`23`	`const { DB_WRITE } = require('./database/consts');`
`24`	`24`
`25`	`25`	`const hash = v => {`
`26`		`- var sum = crypto.createHash('sha1');`
`27`		`- sum.update('foo');`
	`26`	`+ const sum = crypto.createHash('sha1');`
	`27`	`+ sum.update(v);`
`28`	`28`	`return sum.digest();`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ class DevTODService extends BaseService {`
`112`	`112`	`...random_tip,`
`113`	`113`	`];`
`114`	`114`	`if ( ! this.global_config.minimal_console ) {`
`115`		`- lines.unshift("\x1B[1mTip of the Day\x1B[0m"),`
	`115`	`+ lines.unshift("\x1B[1mTip of the Day\x1B[0m");`
`116`	`116`	`lines.push("Type tod:dismiss to un-stick this message");`
`117`	`117`	`}`
`118`	`118`	`surrounding_box('33;1', lines);`
Original file line number	Diff line number	Diff line change
`@@ -131,11 +131,6 @@ class GetUserService extends BaseService {`
`131`	`131`	kv.set(`users:${prop}:${user[prop]}`, user);
`132`	`132`	`}`
`133`	`133`	`}`
`134`		`- // kv.set('users:username:' + user.username, user);`
`135`		`- // kv.set('users:email:' + user.email, user);`
`136`		`- // kv.set('users:uuid:' + user.uuid, user);`
`137`		`- // kv.set('users:id:' + user.id, user);`
`138`		`- // kv.set('users:referral_code:' + user.referral_code, user);`
`139`	`134`	`} catch (e) {`
`140`	`135`	`console.error(e);`
`141`	`136`	`}`