From 5031cea0408698cf4844ac980001fd3d72a48d71 Mon Sep 17 00:00:00 2001 From: KernelDeimos Date: Thu, 16 May 2024 18:55:59 -0400 Subject: [PATCH] Update _default.js for deployment purposes --- packages/backend/src/config.js | 2 ++ packages/backend/src/routers/_default.js | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/backend/src/config.js b/packages/backend/src/config.js index 55b13fadc..bb0a0cf9f 100644 --- a/packages/backend/src/config.js +++ b/packages/backend/src/config.js @@ -62,6 +62,8 @@ config.thumb_width = 80; config.thumb_height = 80; config.app_max_icon_size = 5*1024*1024; +config.defaultjs_asset_path = '../../'; + // config.origin = config.protocol + '://' + config.domain; // config.api_base_url = config.protocol + '://api.' + config.domain; // config.social_card = `${config.origin}/assets/img/screenshot.png`; diff --git a/packages/backend/src/routers/_default.js b/packages/backend/src/routers/_default.js index ff95a02aa..23806b9ef 100644 --- a/packages/backend/src/routers/_default.js +++ b/packages/backend/src/routers/_default.js @@ -46,7 +46,7 @@ router.all('*', async function(req, res, next) { // cloud.js must be accessible globally regardless of subdomain // -------------------------------------- else if (path === '/cloud.js') { - return res.sendFile(_path.join(__dirname, '../../puter.js/alpha.js'), function (err) { + return res.sendFile(_path.join(__dirname, config.defaultjs_asset_path, 'puter.js/alpha.js'), function (err) { if (err && err.statusCode) { return res.status(err.statusCode).send('Error /cloud.js') } @@ -56,14 +56,14 @@ router.all('*', async function(req, res, next) { // /puter.js/v1 must be accessible globally regardless of subdomain // -------------------------------------- else if (path === '/puter.js/v1' || path === '/puter.js/v1/') { - return res.sendFile(_path.join(__dirname, '../../puter.js/v1.js'), function (err) { + return res.sendFile(_path.join(__dirname, config.defaultjs_asset_path, 'puter.js/v1.js'), function (err) { if (err && err.statusCode) { return res.status(err.statusCode).send('Error /puter.js') } }); } else if (path === '/puter.js/v2' || path === '/puter.js/v2/') { - return res.sendFile(_path.join(__dirname, '../../puter.js/v2.js'), function (err) { + return res.sendFile(_path.join(__dirname, config.defaultjs_asset_path, 'puter.js/v2.js'), function (err) { if (err && err.statusCode) { return res.status(err.statusCode).send('Error /puter.js') } @@ -74,14 +74,14 @@ router.all('*', async function(req, res, next) { // -------------------------------------- else if( subdomain === 'js'){ if (path === '/v1' || path === '/v1/') { - return res.sendFile(_path.join(__dirname, '../../puter.js/v1.js'), function (err) { + return res.sendFile(_path.join(__dirname, config.defaultjs_asset_path, 'puter.js/v1.js'), function (err) { if (err && err.statusCode) { return res.status(err.statusCode).send('Error /puter.js') } }); } if (path === '/v2' || path === '/v2/') { - return res.sendFile(_path.join(__dirname, '../../puter.js/v2.js'), function (err) { + return res.sendFile(_path.join(__dirname, config.defaultjs_asset_path, 'puter.js/v2.js'), function (err) { if (err && err.statusCode) { return res.status(err.statusCode).send('Error /puter.js') } @@ -364,7 +364,7 @@ router.all('*', async function(req, res, next) { subdomain === 'draw' || subdomain === 'camera' || subdomain === 'recorder' || subdomain === 'dev-center' || subdomain === 'terminal'){ - let root = _path.join(__dirname, '../../apps/', subdomain); + let root = _path.join(__dirname, config.defaultjs_asset_path, 'apps', subdomain); if ( subdomain === 'docs' ) root += '/dist'; root = _path.normalize(root);