mirrors/puter
1
0
Fork 0
mirror of https://github.com/HeyPuter/puter synced 2024-11-14 22:06:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix phoenix for auto ports

Browse Source
This commit is contained in:
KernelDeimos 2024-04-15 15:34:58 -04:00
parent f3495f3098
commit 1c2b05d8f6
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/backend/src/SelfhostedModule.js
View File

@ -28,7 +28,7 @@ class SelfhostedModule extends AdvancedBase {
command: 'npx',
args: ['rollup', '-c', 'rollup.config.js', '--watch'],
env: {
PUTER_JS_URL: config.origin + '/sdk/puter.dev.js',
PUTER_JS_URL: ({ global_config: config }) => config.origin + '/sdk/puter.dev.js',
}
},
{
@ -37,7 +37,7 @@ class SelfhostedModule extends AdvancedBase {
command: 'npx',
args: ['rollup', '-c', 'rollup.config.js', '--watch'],
env: {
PUTER_JS_URL: config.origin + '/sdk/puter.dev.js',
PUTER_JS_URL: ({ global_config: config }) => config.origin + '/sdk/puter.dev.js',
}
},
],

21
packages/backend/src/services/DevWatcherService.js
View File

@ -40,12 +40,20 @@ class DevWatcherService extends BaseService {
}
async _init (args) {
const { root, commands } = args;
this.args = args;
process.on('exit', () => {
this.exit_all_();
})
}
// Oh geez we need to wait for the web server to initialize
// so that `config.origin` has the actual port in it if the
// port is set to `auto` - you have no idea how confusing
// this was to debug the first time, like Ahhhhhh!!
// but hey at least we have this convenient event listener.
async ['__on_ready.webserver'] () {
const { root, commands } = this.args;
for ( const entry of commands ) {
const { directory } = entry;
const fullpath = this.modules.path.join(
@ -65,11 +73,18 @@ class DevWatcherService extends BaseService {
async start_ ({ name, fullpath, command, args, env }) {
this.log.info(`Starting ${name} in ${fullpath}`);
const env_processed = { ...(env ?? {}) };
for ( const k in env_processed ) {
if ( typeof env_processed[k] !== 'function' ) continue;
env_processed[k] = env_processed[k]({
global_config: this.global_config
});
}
const proc = this.modules.spawn(command, args, {
shell: true,
env: {
...process.env,
...(env ?? {}),
...env_processed,
},
cwd: fullpath,
});