@resonatehq/supabase 0.1.0 → 0.1.3

package/.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"

package/.github/workflows/cd.yaml

@@ -0,0 +1,29 @@
+name: cd
+
+on:
+  release:
+    types: [released]
+
+jobs:
+  run:
+    name: release
+
+    permissions:
+      id-token: write
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+          registry-url: "https://registry.npmjs.org"
+
+      # Ensure npm 11.5.1 or later is installed
+      - name: Update npm
+        run: npm install -g npm@latest
+      - run: npm install
+      - run: npm run build
+      - run: npm publish

package/.github/workflows/ci.yaml

@@ -0,0 +1,39 @@
+name: ci
+
+permissions:
+  contents: read
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [main]
+    paths-ignore:
+      - README.md
+  pull_request:
+    branches: [main]
+    paths-ignore:
+      - README.md
+
+jobs:
+  run:
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 25
+
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: 1.3.0
+
+      - name: install
+        run: bun install
+
+      - name: check linting
+        run: bun run check

package/dist/index.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Resonate = void 0;
 const sdk_1 = require("@resonatehq/sdk");
 const encryptor_1 = require("@resonatehq/sdk/dist/src/encryptor");
+const options_1 = require("@resonatehq/sdk/dist/src/options");
+const tracer_1 = require("@resonatehq/sdk/dist/src/tracer");
 class Resonate {
     constructor({ verbose = false, encryptor = undefined, } = {}) {
         this.registry = new sdk_1.Registry();
@@ -27,7 +29,6 @@ class Resonate {
                 });
             }
             const url = buildForwardedURL(req);
-            console.log("URL", url);
             const body = await req.json();
             if (!req.body) {
                 return new Response(JSON.stringify({
@@ -46,6 +47,8 @@ class Resonate {
                 });
             }
             const encoder = new sdk_1.JsonEncoder();
+            const clock = new sdk_1.WallClock();
+            const tracer = new tracer_1.NoopTracer();
             const network = new sdk_1.HttpNetwork({
                 headers: {},
                 timeout: 60 * 1000, // 60s
@@ -53,22 +56,25 @@ class Resonate {
                 verbose: this.verbose,
             });
             const resonateInner = new sdk_1.ResonateInner({
-                anycastNoPreference: url,
-                anycastPreference: url,
-                clock: new sdk_1.WallClock(),
-                dependencies: this.dependencies,
-                handler: new sdk_1.Handler(network, encoder, this.encryptor),
-                heartbeat: new sdk_1.NoopHeartbeat(),
-                network,
+                unicast: url,
+                anycast: url,
                 pid: `pid-${Math.random().toString(36).substring(7)}`,
+                ttl: 30 * 1000,
+                clock,
+                network,
+                handler: new sdk_1.Handler(network, encoder, this.encryptor),
                 registry: this.registry,
-                ttl: 30 * 1000, // 30s
-                unicast: url,
+                heartbeat: new sdk_1.NoopHeartbeat(),
+                dependencies: this.dependencies,
+                optsBuilder: new options_1.OptionsBuilder({
+                    match: (_) => url,
+                }),
                 verbose: this.verbose,
+                tracer,
             });
             const task = { kind: "unclaimed", task: body.task };
             const completion = new Promise((resolve) => {
-                resonateInner.process(task, (error, status) => {
+                resonateInner.process(tracer.startSpan(task.task.rootPromiseId, clock.now()), task, (error, status) => {
                     if (error || !status) {
                         resolve(new Response(JSON.stringify({
                             error: "Task processing failed",
@@ -110,9 +116,30 @@ class Resonate {
 }
 exports.Resonate = Resonate;
 function buildForwardedURL(req) {
-    const proto = req.headers.get("x-forwarded-proto") ?? "http";
-    const host = req.headers.get("x-forwarded-host") ?? req.headers.get("host");
-    const port = req.headers.get("x-forwarded-port");
-    const path = req.headers.get("x-forwarded-path");
-    return `${proto}://${host}${port ? `:${port}` : ""}${path}`;
+    const headers = req.headers;
+    const url = new URL(req.url);
+    // 1. Hostname Logic
+    // Dev: "x-forwarded-host" is present (e.g., 127.0.0.1)
+    // Prod: "x-forwarded-host" is missing, so we use url.hostname (e.g., project.supabase.co)
+    const forwardedHost = headers.get("x-forwarded-host");
+    const host = forwardedHost ?? url.hostname;
+    // 2. Protocol Logic
+    // Always prefer "x-forwarded-proto" (usually https in prod), fallback to "http"
+    const proto = headers.get("x-forwarded-proto") ?? "http";
+    // 3. Port Logic
+    // Dev: We need the port (e.g., :54321).
+    // Prod: We rarely need :443 explicitly in the URL string.
+    const forwardedPort = headers.get("x-forwarded-port");
+    const port = forwardedHost && forwardedPort ? `:${forwardedPort}` : "";
+    // 4. Path Logic
+    // Dev: "x-forwarded-path" contains the full path (/functions/v1/hello-world)
+    // Prod: We must use url.pathname.
+    let path = headers.get("x-forwarded-path") ?? url.pathname;
+    // 5. Production Path Fix
+    // In Prod, the internal req.url often strips '/functions/v1'.
+    // We re-add it if we are in Prod (no forwardedHost) and it's missing.
+    if (!forwardedHost && !path.startsWith("/functions/v1")) {
+        path = `/functions/v1${path}`;
+    }
+    return `${proto}://${host}${port}${path}`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@resonatehq/supabase",
-  "version": "0.1.0",
+  "version": "0.1.3",
   "description": "Resonate FaaS handler for Supabase Edge Functions (TypeScript)",
   "repository": {
     "url": "https://github.com/resonatehq/resonate-faas-supabase-ts"
@@ -29,6 +29,6 @@
     "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@resonatehq/sdk": "^0.8.6"
+    "@resonatehq/sdk": "^0.9.3"
   }
 }

package/src/index.ts

@@ -13,6 +13,8 @@ import {
 	type Encryptor,
 	NoopEncryptor,
 } from "@resonatehq/sdk/dist/src/encryptor";
+import { OptionsBuilder } from "@resonatehq/sdk/dist/src/options";
+import { NoopTracer } from "@resonatehq/sdk/dist/src/tracer";
 
 export class Resonate {
 	private registry = new Registry();
@@ -77,7 +79,6 @@ export class Resonate {
 			}
 
 			const url = buildForwardedURL(req);
-			console.log("URL", url);
 			const body: any = await req.json();
 
 			if (!req.body) {
@@ -108,6 +109,8 @@ export class Resonate {
 			}
 
 			const encoder = new JsonEncoder();
+			const clock = new WallClock();
+			const tracer = new NoopTracer();
 			const network = new HttpNetwork({
 				headers: {},
 				timeout: 60 * 1000, // 60s
@@ -116,68 +119,75 @@ export class Resonate {
 			});
 
 			const resonateInner = new ResonateInner({
-				anycastNoPreference: url,
-				anycastPreference: url,
-				clock: new WallClock(),
-				dependencies: this.dependencies,
-				handler: new Handler(network, encoder, this.encryptor),
-				heartbeat: new NoopHeartbeat(),
-				network,
+				unicast: url,
+				anycast: url,
 				pid: `pid-${Math.random().toString(36).substring(7)}`,
+				ttl: 30 * 1000,
+				clock,
+				network,
+				handler: new Handler(network, encoder, this.encryptor),
 				registry: this.registry,
-				ttl: 30 * 1000, // 30s
-				unicast: url,
+				heartbeat: new NoopHeartbeat(),
+				dependencies: this.dependencies,
+				optsBuilder: new OptionsBuilder({
+					match: (_: string): string => url,
+				}),
 				verbose: this.verbose,
+				tracer,
 			});
 
 			const task: Task = { kind: "unclaimed", task: body.task };
 
 			const completion: Promise<Response> = new Promise((resolve) => {
-				resonateInner.process(task, (error, status) => {
-					if (error || !status) {
-						resolve(
-							new Response(
-								JSON.stringify({
-									error: "Task processing failed",
-									details: { error, status },
-								}),
-								{
-									status: 500,
-								},
-							),
-						);
-						return;
-					}
-
-					if (status.kind === "completed") {
-						resolve(
-							new Response(
-								JSON.stringify({
-									status: "completed",
-									result: status.promise.value,
-									requestUrl: url,
-								}),
-								{
-									status: 200,
-								},
-							),
-						);
-						return;
-					} else if (status.kind === "suspended") {
-						resolve(
-							new Response(
-								JSON.stringify({
-									status: "suspended",
-									requestUrl: url,
-								}),
-								{
-									status: 200,
-								},
-							),
-						);
-						return;
-					}
-				});
+				resonateInner.process(
+					tracer.startSpan(task.task.rootPromiseId, clock.now()),
+					task,
+					(error, status) => {
+						if (error || !status) {
+							resolve(
+								new Response(
+									JSON.stringify({
+										error: "Task processing failed",
+										details: { error, status },
+									}),
+									{
+										status: 500,
+									},
+								),
+							);
+							return;
+						}
+
+						if (status.kind === "completed") {
+							resolve(
+								new Response(
+									JSON.stringify({
+										status: "completed",
+										result: status.promise.value,
+										requestUrl: url,
+									}),
+									{
+										status: 200,
+									},
+								),
+							);
+							return;
+						} else if (status.kind === "suspended") {
+							resolve(
+								new Response(
+									JSON.stringify({
+										status: "suspended",
+										requestUrl: url,
+									}),
+									{
+										status: 200,
+									},
+								),
+							);
+							return;
+						}
+					},
+				);
 			});
 			return completion;
 		} catch (error) {
@@ -192,10 +202,36 @@ export class Resonate {
 }
 
 function buildForwardedURL(req: Request) {
-	const proto = req.headers.get("x-forwarded-proto") ?? "http";
-	const host = req.headers.get("x-forwarded-host") ?? req.headers.get("host");
-	const port = req.headers.get("x-forwarded-port");
-	const path = req.headers.get("x-forwarded-path");
+	const headers = req.headers;
+	const url = new URL(req.url);
+
+	// 1. Hostname Logic
+	// Dev: "x-forwarded-host" is present (e.g., 127.0.0.1)
+	// Prod: "x-forwarded-host" is missing, so we use url.hostname (e.g., project.supabase.co)
+	const forwardedHost = headers.get("x-forwarded-host");
+	const host = forwardedHost ?? url.hostname;
+
+	// 2. Protocol Logic
+	// Always prefer "x-forwarded-proto" (usually https in prod), fallback to "http"
+	const proto = headers.get("x-forwarded-proto") ?? "http";
+
+	// 3. Port Logic
+	// Dev: We need the port (e.g., :54321).
+	// Prod: We rarely need :443 explicitly in the URL string.
+	const forwardedPort = headers.get("x-forwarded-port");
+	const port = forwardedHost && forwardedPort ? `:${forwardedPort}` : "";
+
+	// 4. Path Logic
+	// Dev: "x-forwarded-path" contains the full path (/functions/v1/hello-world)
+	// Prod: We must use url.pathname.
+	let path = headers.get("x-forwarded-path") ?? url.pathname;
+
+	// 5. Production Path Fix
+	// In Prod, the internal req.url often strips '/functions/v1'.
+	// We re-add it if we are in Prod (no forwardedHost) and it's missing.
+	if (!forwardedHost && !path.startsWith("/functions/v1")) {
+		path = `/functions/v1${path}`;
+	}
 
-	return `${proto}://${host}${port ? `:${port}` : ""}${path}`;
+	return `${proto}://${host}${port}${path}`;
 }