From 6590da5793e9df0ec0470f7e1ad6b69777ec0198 Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Thu, 27 Feb 2025 15:00:02 -0500 Subject: [PATCH] js: Just delete some placeholder comments around code that I am trying to delete. --- core/app.js | 41 ++----------------------------- core/core.js | 68 ++++------------------------------------------------ 2 files changed, 6 insertions(+), 103 deletions(-) diff --git a/core/app.js b/core/app.js index a34adc64..7e9e885b 100644 --- a/core/app.js +++ b/core/app.js @@ -2,39 +2,13 @@ import * as core from './core.js'; let gSessionIndex = 0; -/** - * TODOC - * @returns - */ -function makeSessionId() { - return 'session_' + (gSessionIndex++).toString(); -} - -/** - * TODOC - * @returns - */ function App() { - this._on_output = null; this._send_queue = []; this.calls = {}; this._next_call_id = 1; return this; } -/** - * TODOC - * @param {*} callback - */ -App.prototype.readOutput = function (callback) { - this._on_output = callback; -}; - -/** - * TODOC - * @param {*} api - * @returns - */ App.prototype.makeFunction = function (api) { let self = this; let result = function () { @@ -58,10 +32,6 @@ App.prototype.makeFunction = function (api) { return result; }; -/** - * TODOC - * @param {*} message - */ App.prototype.send = function (message) { if (this._send_queue) { if (this._on_output) { @@ -76,11 +46,6 @@ App.prototype.send = function (message) { } }; -/** - * TODOC - * @param {*} request - * @param {*} response - */ exports.app_socket = async function socket(request, response) { let process; let options = {}; @@ -162,7 +127,7 @@ exports.app_socket = async function socket(request, response) { options.packageOwner = packageOwner; options.packageName = packageName; options.url = message.url; - let sessionId = makeSessionId(); + let sessionId = 'session_' + (gSessionIndex++).toString(); if (blobId) { if (message.edit_only) { response.send( @@ -190,9 +155,7 @@ exports.app_socket = async function socket(request, response) { } } }; - process.app.readOutput(function (message) { - response.send(JSON.stringify(message), 0x1); - }); + process.app._on_output = (message) => response.send(JSON.stringify(message), 0x1); process.app.send(); } diff --git a/core/core.js b/core/core.js index 14221692..4959273d 100644 --- a/core/core.js +++ b/core/core.js @@ -3,12 +3,10 @@ import * as http from './http.js'; let gProcesses = {}; let gStatsTimer = false; -let kPingInterval = 60 * 1000; +let g_handler_index = 0; + +const k_ping_interval = 60 * 1000; -/** - * TODOC - * @param {*} error - */ function printError(error) { if (error.stackTrace) { print(error.fileName + ':' + error.lineNumber + ': ' + error.message); @@ -21,12 +19,6 @@ function printError(error) { } } -/** - * TODOC - * @param {*} handlers - * @param {*} argv - * @returns - */ function invoke(handlers, argv) { let promises = []; if (handlers) { @@ -47,12 +39,6 @@ function invoke(handlers, argv) { return Promise.all(promises); } -/** - * TODOC - * @param {*} eventName - * @param {*} argv - * @returns - */ function broadcastEvent(eventName, argv) { let promises = []; for (let process of Object.values(gProcesses)) { @@ -63,11 +49,6 @@ function broadcastEvent(eventName, argv) { return Promise.all(promises); } -/** - * TODOC - * @param {*} message - * @returns - */ function broadcast(message) { let sender = this; let promises = []; @@ -84,12 +65,6 @@ function broadcast(message) { return Promise.all(promises); } -/** - * TODOC - * @param {String} eventName - * @param {*} argv - * @returns - */ function broadcastAppEventToUser( user, packageOwner, @@ -112,12 +87,6 @@ function broadcastAppEventToUser( return Promise.all(promises); } -/** - * TODOC - * @param {*} caller - * @param {*} process - * @returns - */ function getUser(caller, process) { return { key: process.key, @@ -128,12 +97,6 @@ function getUser(caller, process) { }; } -/** - * TODOC - * @param {*} user - * @param {*} process - * @returns - */ async function getApps(user, process) { if ( process.credentials && @@ -160,28 +123,13 @@ async function getApps(user, process) { return {}; } -/** - * TODOC - * @param {*} from - * @param {*} to - * @param {*} message - * @returns - */ function postMessageInternal(from, to, message) { if (to.eventHandlers['message']) { return invoke(to.eventHandlers['message'], [getUser(from, from), message]); } } -/** - * TODOC - * @param {*} blobId - * @param {*} key - * @param {*} options - * @returns - */ async function getProcessBlob(blobId, key, options) { - // TODO(tasiaiso): break this down ? let process = gProcesses[key]; if (!process && !(options && 'create' in options && !options.create)) { let resolveReady; @@ -200,7 +148,7 @@ async function getProcessBlob(blobId, key, options) { } process.lastActive = Date.now(); process.lastPing = null; - process.timeout = kPingInterval; + process.timeout = k_ping_interval; process.ready = new Promise(function (resolve, reject) { resolveReady = resolve; rejectReady = reject; @@ -731,9 +679,6 @@ ssb.addEventListener('connections', function () { broadcastEvent('onConnectionsChanged', []); }); -/** - * TODOC - */ async function loadSettings() { let data = {}; try { @@ -752,9 +697,6 @@ async function loadSettings() { return data; } -/** - * TODOC - */ function sendStats() { let apps = Object.values(gProcesses) .filter((process) => process.app) @@ -770,8 +712,6 @@ function sendStats() { } } -let g_handler_index = 0; - exports.callAppHandler = async function callAppHandler( response, app_blob_id,