lee/puter
1
0
Fork 0
mirror of https://github.com/HeyPuter/puter.git synced 2026-05-04 16:40:41 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

add ability to specify app for worker

Browse Source
This commit is contained in:
ProgrammerIn-wonderland
2025-08-06 17:40:09 -04:00
committed by Neal Shah
parent acc29a35c4
commit 66288f798e
2 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/src/services/worker/WorkerService.js
+32 -8
View File
@@ -189,15 +189,22 @@ class WorkerService extends BaseService {
* @param {{filePath: string, workerName: string, authorization: string}} param0
* @returns {any}
*/
async create({ filePath, workerName, authorization }) {
async create({ filePath, workerName, authorization, appId }) {
try {
workerName = workerName.toLocaleLowerCase(); // just incase
const svc_su = this.services.get("su");
const es_subdomain = this.services.get('es:subdomain');
const svc_auth = this.services.get("auth");
const currentDomains = await svc_su.sudo(Context.get("actor").get_related_actor(UserActorType), async () => {
return (await es_subdomain.select({ predicate: new StartsWith({ key: "subdomain", value: "workers.puter." }) }));
});
// TODO//Urgent there needs to be a check here to make sure the user is god mode
if (appId) {
authorization = await svc_auth.get_user_app_token(appId);
}
if (currentDomains.length >= 100) {
throw APIError.create('subdomain_limit_reached', null, {isWorker: true, limit: 100});
}
@@ -217,13 +224,26 @@ class WorkerService extends BaseService {
const userData = await getUserInfo(authorization, this.global_config.api_base_url);
const actor = Context.get("actor");
await Context.sub({ [SKIP_ES_VALIDATION]: true }).arun(async () => {
const entity = await Entity.create({ om: es_subdomain.om }, {
subdomain: "workers.puter." + calculateWorkerNameNew(userData, workerName),
root_dir: filePath
if (appId) {
await svc_su.sudo(await svc_auth.authenticate_from_token(authorization), async()=> {
await Context.sub({ [SKIP_ES_VALIDATION]: true }).arun(async () => {
const entity = await Entity.create({ om: es_subdomain.om }, {
subdomain: "workers.puter." + calculateWorkerNameNew(userData, workerName),
root_dir: filePath
});
await es_subdomain.upsert(entity);
});
});
await es_subdomain.upsert(entity);
});
} else {
await Context.sub({ [SKIP_ES_VALIDATION]: true }).arun(async () => {
const entity = await Entity.create({ om: es_subdomain.om }, {
subdomain: "workers.puter." + calculateWorkerNameNew(userData, workerName),
root_dir: filePath
});
await es_subdomain.upsert(entity);
});
}
const fileData = (await readPuterFile(actor, filePath)).toString();
const cfData = await createWorker(userData, authorization, calculateWorkerNameNew(userData.uuid, workerName), preamble + fileData, PREAMBLE_LENGTH);
@@ -334,6 +354,10 @@ class WorkerService extends BaseService {
authorization: {
type: "string",
description: "Puter token"
},
appId: {
type: "string",
description: "App ID to tie a worker to"
}
},
result: { type: 'json' },
src/puter-js/src/modules/Workers.js
+2 -2
View File
@@ -7,7 +7,7 @@ export class WorkersHandler {
this.authToken = authToken;
}
async create(workerName, filePath) {
async create(workerName, filePath, appId) {
if (!puter.authToken && puter.env === 'web') {
try {
await puter.ui.authenticateWithPuter();
@@ -24,7 +24,7 @@ export class WorkersHandler {
}
filePath = getAbsolutePathForApp(filePath);
const driverResult = await utils.make_driver_method(['authorization', 'filePath', 'workerName'], 'workers', "worker-service", 'create')(puter.authToken, filePath, workerName);;
const driverResult = await utils.make_driver_method(['authorization', 'filePath', 'workerName', 'appId'], 'workers', "worker-service", 'create')(puter.authToken, filePath, workerName, appId);;
if (!driverResult.success) {
throw new Error(driverResult?.errors || "Driver failed to execute, do you have the necessary permissions?");