@positronic/cloudflare 0.0.76 → 0.0.78

package/dist/src/api/webhooks/index.js

@@ -165,7 +165,7 @@ function _ts_generator(thisArg, body) {
     }
 }
 import { Hono } from 'hono';
-import { getWebhookManifest } from '../../brain-runner-do.js';
+import { getWebhookManifest, startBrainRun } from '../../brain-runner-do.js';
 import { queueWebhookAndWakeUp } from './coordination.js';
 import system from './system.js';
 var webhooks = new Hono();
@@ -197,7 +197,7 @@ webhooks.get('/', function(context) {
 // Receive incoming webhook from external service (user-defined webhooks)
 webhooks.post('/:slug', function(context) {
     return _async_to_generator(function() {
-        var slug, webhookManifest, webhook, clonedReq, handlerResult, submittedToken, contentType, formData, e, result, error;
+        var slug, webhookManifest, webhook, handlerResult, brainRunId, submittedToken, result, error;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -216,13 +216,10 @@ webhooks.post('/:slug', function(context) {
                 case 1:
                     _state.trys.push([
                         1,
-                        8,
+                        6,
                         ,
-                        9
+                        7
                     ]);
-                    // Clone the request so we can extract the CSRF token separately
-                    // without consuming the body that the user's handler needs
-                    clonedReq = context.req.raw.clone();
                     return [
                         4,
                         webhook.handler(context.req.raw)
@@ -238,44 +235,54 @@ webhooks.post('/:slug', function(context) {
                             })
                         ];
                     }
-                    // Extract CSRF token from form submissions
-                    submittedToken = null;
-                    contentType = clonedReq.headers.get('content-type') || '';
-                    if (!(contentType.includes('form-urlencoded') || contentType.includes('form-data'))) return [
+                    // Handler determined this event should be ignored
+                    if (handlerResult.type === 'ignore') {
+                        return [
+                            2,
+                            context.json({
+                                received: true,
+                                action: 'ignored'
+                            })
+                        ];
+                    }
+                    if (!(handlerResult.type === 'trigger')) return [
                         3,
-                        6
+                        4
                     ];
-                    _state.label = 3;
-                case 3:
-                    _state.trys.push([
-                        3,
-                        5,
-                        ,
-                        6
-                    ]);
+                    if (!webhook.triggers) {
+                        return [
+                            2,
+                            context.json({
+                                error: "Webhook '".concat(slug, "' returned trigger result but has no triggers config")
+                            }, 400)
+                        ];
+                    }
                     return [
                         4,
-                        clonedReq.formData()
-                    ];
-                case 4:
-                    formData = _state.sent();
-                    submittedToken = formData.get('__positronic_token');
-                    return [
-                        3,
-                        6
+                        startBrainRun(context.env.BRAIN_RUNNER_DO, webhook.triggers.brain, {
+                            name: webhook.triggers.runAs
+                        }, {
+                            initialState: handlerResult.response
+                        })
                     ];
-                case 5:
-                    e = _state.sent();
+                case 3:
+                    brainRunId = _state.sent();
                     return [
-                        3,
-                        6
+                        2,
+                        context.json({
+                            received: true,
+                            action: 'triggered',
+                            brainRunId: brainRunId
+                        }, 201)
                     ];
-                case 6:
+                case 4:
+                    // CSRF token is passed as a query parameter (if present)
+                    submittedToken = context.req.query('token') || null;
                     return [
                         4,
                         queueWebhookAndWakeUp(context, slug, handlerResult.identifier, handlerResult.response, submittedToken)
                     ];
-                case 7:
+                case 5:
                     result = _state.sent();
                     // For user webhooks, return 'queued' instead of 'not_found' when no brain is waiting
                     // This allows webhooks to be received even when no brain is actively waiting
@@ -293,7 +300,7 @@ webhooks.post('/:slug', function(context) {
                         2,
                         context.json(result)
                     ];
-                case 8:
+                case 6:
                     error = _state.sent();
                     console.error("Error receiving webhook ".concat(slug, ":"), error);
                     return [
@@ -302,7 +309,7 @@ webhooks.post('/:slug', function(context) {
                             error: 'Failed to process webhook'
                         }, 500)
                     ];
-                case 9:
+                case 7:
                     return [
                         2
                     ];

package/dist/src/api/webhooks/system.js

@@ -171,21 +171,23 @@ function _ts_generator(thisArg, body) {
     }
 }
 import { Hono } from 'hono';
-import { queueWebhookAndWakeUp, parseFormData } from './coordination.js';
+import { parseFormData } from '@positronic/core';
+import { queueWebhookAndWakeUp } from './coordination.js';
 var system = new Hono();
 /**
- * Built-in webhook for UI form submissions.
- * This handles form POSTs from pages generated by .ui() steps.
+ * Built-in webhook for page form submissions.
+ * This handles form POSTs from pages generated by .page() steps.
  *
- * POST /webhooks/system/ui-form?identifier=<identifier>
+ * POST /webhooks/system/page-form?identifier=<identifier>&token=<token>
  * Content-Type: application/x-www-form-urlencoded or multipart/form-data
- */ system.post('/ui-form', function(context) {
+ */ system.post('/page-form', function(context) {
     return _async_to_generator(function() {
-        var identifier, formData, _parseFormData, response, token, result, error;
+        var identifier, token, formData, response, result, error;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
                     identifier = context.req.query('identifier');
+                    token = context.req.query('token');
                     if (!identifier) {
                         return [
                             2,
@@ -194,6 +196,18 @@ var system = new Hono();
                             }, 400)
                         ];
                     }
+                    // System page-form endpoint always requires a CSRF token
+                    if (!token) {
+                        return [
+                            2,
+                            context.json({
+                                received: false,
+                                action: 'ignored',
+                                identifier: identifier,
+                                reason: 'Missing form token'
+                            }, 403)
+                        ];
+                    }
                     _state.label = 1;
                 case 1:
                     _state.trys.push([
@@ -208,22 +222,10 @@ var system = new Hono();
                     ];
                 case 2:
                     formData = _state.sent();
-                    _parseFormData = parseFormData(formData), response = _parseFormData.data, token = _parseFormData.token;
-                    // System ui-form endpoint always requires a CSRF token
-                    if (!token) {
-                        return [
-                            2,
-                            context.json({
-                                received: false,
-                                action: 'ignored',
-                                identifier: identifier,
-                                reason: 'Missing form token'
-                            }, 403)
-                        ];
-                    }
+                    response = parseFormData(formData);
                     return [
                         4,
-                        queueWebhookAndWakeUp(context, 'ui-form', identifier, response, token)
+                        queueWebhookAndWakeUp(context, 'page-form', identifier, response, token)
                     ];
                 case 3:
                     result = _state.sent();
@@ -249,7 +251,7 @@ var system = new Hono();
                     ];
                 case 4:
                     error = _state.sent();
-                    console.error('Error processing UI form submission:', error);
+                    console.error('Error processing page form submission:', error);
                     return [
                         2,
                         context.json({