lee/puter
1
0
Fork 0
mirror of https://github.com/HeyPuter/puter.git synced 2026-07-09 00:31:53 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix error reporting in puterjs. Add precheck for puterOutputPath

Browse Source
This commit is contained in:
ProgrammerIn-wonderland
2026-05-11 16:40:47 -04:00
parent 11482e3233
commit ba59637642
3 changed files with 48 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/drivers/ai-image/ImageGenerationDriver.ts
+23 -13
View File
@@ -121,6 +121,25 @@ export class ImageGenerationDriver extends PuterDriver {
const puterOutputPath = args.puter_output_path;
delete args.puter_output_path;
// Validate the output path early — before spending credits.
let resolvedOutputPath: string | undefined;
if (puterOutputPath) {
const username = actor.user?.username;
const userId = actor.user?.id;
if (!userId || !username) {
throw new HttpError(
400,
'User ID required for puter_output_path',
{ legacyCode: 'bad_request' },
);
}
resolvedOutputPath = this.#resolveOutputPath(
puterOutputPath,
username,
);
await this.#assertWriteAccess(actor, resolvedOutputPath);
}
let modelId = args.model?.trim().toLowerCase();
let intendedProvider =
args.provider ?? (Context.get('driverName') as string | undefined);
@@ -179,8 +198,8 @@ export class ImageGenerationDriver extends PuterDriver {
provider: model.provider,
});
if (puterOutputPath) {
await this.#saveToFS(actor, result, puterOutputPath);
if (resolvedOutputPath) {
await this.#saveToFS(actor, result, resolvedOutputPath);
}
return result;
@@ -350,18 +369,9 @@ export class ImageGenerationDriver extends PuterDriver {
async #saveToFS(
actor: Actor,
result: string,
outputPath: string,
resolvedPath: string,
): Promise<void> {
const userId = actor.user?.id;
const username = actor.user?.username;
if (!userId || !username) {
throw new HttpError(400, 'User ID required for puter_output_path', {
legacyCode: 'bad_request',
});
}
const resolvedPath = this.#resolveOutputPath(outputPath, username);
await this.#assertWriteAccess(actor, resolvedPath);
const userId = actor.user!.id!;
let buffer: Buffer;
let contentType: string;
src/backend/drivers/ai-video/VideoGenerationDriver.ts
+23 -13
View File
@@ -121,6 +121,25 @@ export class VideoGenerationDriver extends PuterDriver {
const puterOutputPath = args.puter_output_path;
delete args.puter_output_path;
// Validate the output path early — before spending credits.
let resolvedOutputPath: string | undefined;
if (puterOutputPath) {
const username = actor.user?.username;
const userId = actor.user?.id;
if (!userId || !username) {
throw new HttpError(
400,
'User ID required for puter_output_path',
{ legacyCode: 'bad_request' },
);
}
resolvedOutputPath = this.#resolveOutputPath(
puterOutputPath,
username,
);
await this.#assertWriteAccess(actor, resolvedOutputPath);
}
if (args.model) {
args.model = args.model.trim().toLowerCase();
}
@@ -209,8 +228,8 @@ export class VideoGenerationDriver extends PuterDriver {
provider: model.provider,
});
if (puterOutputPath) {
return await this.#saveToFS(actor, result, puterOutputPath);
if (resolvedOutputPath) {
return await this.#saveToFS(actor, result, resolvedOutputPath);
}
return result;
@@ -360,18 +379,9 @@ export class VideoGenerationDriver extends PuterDriver {
async #saveToFS(
actor: Actor,
result: unknown,
outputPath: string,
resolvedPath: string,
): Promise<unknown> {
const userId = actor.user?.id;
const username = actor.user?.username;
if (!userId || !username) {
throw new HttpError(400, 'User ID required for puter_output_path', {
legacyCode: 'bad_request',
});
}
const resolvedPath = this.#resolveOutputPath(outputPath, username);
await this.#assertWriteAccess(actor, resolvedPath);
const userId = actor.user!.id!;
let buffer: Buffer;
let contentType: string;
src/puter-js/src/lib/utils.js
+2 -2
View File
@@ -521,7 +521,7 @@ async function driverCall_ (
}
// HTTP Error - unauthorized
if ( response.status === 401 || resp?.code === 'token_auth_failed' ) {
if ( response.target.status === 401 || resp?.code === 'token_auth_failed' ) {
if ( resp?.code === 'token_auth_failed' && puter.env === 'web' ) {
try {
puter.resetAuthToken();
@@ -543,7 +543,7 @@ async function driverCall_ (
return reject_func({ status: 401, message: 'Unauthorized' });
}
// HTTP Error - other
else if ( response.status && response.status !== 200 ) {
else if ( response.target.status && response.target.status !== 200 ) {
// if error callback is provided, call it
error_cb(resp);
// reject promise