Skip to content

Commit 8f7a68a

Browse files
Revert "Logs Update" (#1730)
* Revert "fix: quick fix for config context issue" This reverts commit 0c06040. * Revert "sync: package-lock.json" This reverts commit 1e1bd0f. * Revert "devex: misc log cleanup" This reverts commit a64a786. * Revert "devex: minimal first page load logs" This reverts commit 196e463. * Revert "devex: minimal initialization logs" This reverts commit ea9c222. * Revert "fix: add missing await in kv example extension" This reverts commit 9b34e67. * Revert "devex: reduce logs at init" This reverts commit fa22114. * Revert "sync: package.json changes" This reverts commit 4db73d7. * Revert "fix: remove unused AWS SDK v2 import" This reverts commit 4d8692f. * Revert "devex: hide `npm install` output unless it fails" This reverts commit fe03a4b. * Revert "devex: rollup via module instead of subprocess" This reverts commit 360082d. * Revert "devex: webpack via module instead of subprocess" This reverts commit 1449d12. * Optional chain logger
1 parent 2c614b2 commit 8f7a68a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1692
-5493
lines changed

extensions/example-kv.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ extension.on('init', async () => {
2525
// and just a little bit longer
2626
// await sleep(100);
2727

28-
console.log('kv key should no longer have the value', await kv.get('example-kv-key'));
28+
console.log('kv key should no longer have the value', kv.get('example-kv-key'));
2929
})();
3030
});

package-lock.json

Lines changed: 1544 additions & 5077 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
},
5858
"dependencies": {
5959
"@aws-sdk/client-secrets-manager": "^3.879.0",
60-
"@aws-sdk/client-sns": "^3.907.0",
6160
"@google/genai": "^1.19.0",
6261
"@heyputer/putility": "^1.0.2",
6362
"@paralleldrive/cuid2": "^2.2.2",
@@ -75,11 +74,11 @@
7574
"uuid": "^9.0.1"
7675
},
7776
"optionalDependencies": {
78-
"sharp": "^0.34.4",
77+
"sharp": "^0.34.3",
7978
"sharp-bmp": "^0.1.5",
8079
"sharp-ico": "^0.1.5"
8180
},
8281
"engines": {
8382
"node": ">=20.19.5"
8483
}
85-
}
84+
}

src/backend/exports.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ module.exports = {
6363
HostOSModule,
6464
CoreModule,
6565
WebModule,
66-
// TemplateModule,
66+
TemplateModule,
6767
AppsModule,
6868
CaptchaModule,
6969
EntityStoreModule,

src/backend/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"@pagerduty/pdjs": "^2.2.4",
2525
"@smithy/node-http-handler": "^2.2.2",
2626
"args": "^5.0.3",
27+
"aws-sdk": "^2.1383.0",
2728
"axios": "^1.8.2",
2829
"bcrypt": "^5.1.0",
2930
"better-sqlite3": "^11.9.0",

src/backend/src/Extension.js

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -36,30 +36,13 @@ class Extension extends AdvancedBase {
3636
]
3737
}),
3838
];
39-
40-
randomBrightColor() {
41-
// Bright colors in ANSI (foreground codes 90–97)
42-
const brightColors = [
43-
// 91, // Bright Red
44-
92, // Bright Green
45-
// 93, // Bright Yellow
46-
94, // Bright Blue
47-
95, // Bright Magenta
48-
// 96, // Bright Cyan
49-
];
50-
51-
return brightColors[Math.floor(Math.random() * brightColors.length)];
52-
}
5339

5440
constructor (...a) {
5541
super(...a);
5642
this.service = null;
5743
this.log = null;
5844
this.ensure_service_();
5945

60-
// this.terminal_color = this.randomBrightColor();
61-
this.terminal_color = 94;
62-
6346
this.log = (...a) => {
6447
this.log_context.info(a.join(' '));
6548
};
@@ -277,14 +260,6 @@ class Extension extends AdvancedBase {
277260
}
278261
this.only_one_init_fn = callback;
279262
}
280-
281-
get console () {
282-
const extensionConsole = Object.create(console);
283-
extensionConsole.log = (...a) => {
284-
console.log(`\x1B[${this.terminal_color};1m(extension/${this.name})\x1B[0m`, ...a);
285-
};
286-
return extensionConsole;
287-
}
288263

289264
/**
290265
* This method will create the "default service" for an extension.

src/backend/src/Kernel.js

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,8 @@ class Kernel extends AdvancedBase {
218218
await services.ready;
219219
globalThis.services = services;
220220
const log = services.get('log-service').create('init');
221+
log.info('services ready');
222+
221223
log.system('server ready', {
222224
deployment_type: globalThis.deployment_type,
223225
});
@@ -409,7 +411,6 @@ class Kernel extends AdvancedBase {
409411
`const { use: puter } = globalThis.__puter_extension_globals__.useapi;`,
410412
`const extension = globalThis.__puter_extension_globals__` +
411413
`.extensionObjectRegistry[${JSON.stringify(extension_id)}];`,
412-
`const console = extension.console;`,
413414
`const runtime = extension.runtime;`,
414415
`const config = extension.config;`,
415416
`const registry = extension.registry;`,
@@ -464,8 +465,6 @@ class Kernel extends AdvancedBase {
464465
},
465466
});
466467

467-
mod.extension.name = packageJSON.name;
468-
469468
const maybe_promise = (typ => typ.trim().toLowerCase())(packageJSON.type ?? '') === 'module'
470469
? await import(path_.join(require_dir, packageJSON.main ?? 'index.js'))
471470
: require(require_dir);
@@ -578,34 +577,18 @@ class Kernel extends AdvancedBase {
578577

579578
async run_npm_install (path) {
580579
const npmCmd = process.platform === "win32" ? "npm.cmd" : "npm";
581-
const proc = spawn(npmCmd, ["install"], { cwd: path, stdio: "pipe" });
582-
583-
let buffer = '';
584-
585-
proc.stdout.on('data', (data) => {
586-
buffer += data.toString();
587-
});
588-
589-
proc.stderr.on('data', (data) => {
590-
buffer += data.toString();
591-
});
592-
580+
const proc = spawn(npmCmd, ["install"], { cwd: path, shell: true, stdio: "inherit" });
593581
return new Promise((rslv, rjct) => {
594582
proc.on('close', code => {
595583
if ( code !== 0 ) {
596-
// Print buffered output on error
597-
if ( buffer ) process.stdout.write(buffer);
598-
rjct(new Error(`exit code: ${code}`));
599-
return;
584+
throw new Error(`exit code: ${code}`);
600585
}
601586
rslv();
602587
});
603588
proc.on('error', err => {
604-
// Print buffered output on error
605-
if ( buffer ) process.stdout.write(buffer);
606589
rjct(err);
607-
});
608-
});
590+
})
591+
})
609592
}
610593
}
611594

src/backend/src/boot/BootLogger.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@
1717
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1818
*/
1919
class BootLogger {
20+
constructor () {
21+
console.log(
22+
`\x1B[36;1mBoot logger started :)\x1B[0m`,
23+
);
24+
}
2025
info (...args) {
2126
console.log(
2227
'\x1B[36;1m[BOOT/INFO]\x1B[0m',

src/backend/src/boot/RuntimeEnvironment.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ class RuntimeEnvironment extends AdvancedBase {
381381
if ( ! checks_pass ) continue;
382382

383383
this.logger.info(
384-
`${hl(meta.pathFor)} ${quot(entry.path)}`
384+
`${hl('USING')} ${quot(entry.path)} for ${meta.pathFor}.`
385385
)
386386

387387
return entry;

src/backend/src/config.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,7 @@ const config_pointer = {};
246246
config_to_export = new Proxy(config_to_export, {
247247
set: (target, prop, value, receiver) => {
248248
const logger = Context.get('logger', { allow_fallback: true });
249-
// If no logger, just give up
250-
if ( logger ) logger.debug(
249+
logger?.debug(
251250
'\x1B[36;1mCONFIGURATION MUTATED AT RUNTIME\x1B[0m',
252251
{ prop, value },
253252
);

0 commit comments

Comments
 (0)