@opendatalabs/personal-server-ts-server 0.2.0 → 1.0.1

package/dist/routes/data.js

@@ -1,213 +1,48 @@
 import { Hono } from "hono";
-import { ScopeSchema } from "@opendatalabs/personal-server-ts-core/scopes";
-import { createDataFileEnvelope } from "@opendatalabs/personal-server-ts-core/schemas/data-file";
-import { generateCollectedAt, writeDataFile, readDataFile, deleteAllForScope, } from "@opendatalabs/personal-server-ts-core/storage/hierarchy";
+import { handlePersonalServerDataRequest, } from "@opendatalabs/personal-server-ts-core/api";
 import { createBodyLimit, DATA_INGEST_MAX_SIZE, } from "../middleware/body-limit.js";
-import { createWeb3AuthMiddleware } from "../middleware/web3-auth.js";
-import { createBuilderCheckMiddleware } from "../middleware/builder-check.js";
-import { createGrantCheckMiddleware } from "../middleware/grant-check.js";
-import { createAccessLogMiddleware } from "../middleware/access-log.js";
-import { createOwnerCheckMiddleware } from "../middleware/owner-check.js";
+import { createNodeDataStorage } from "../storage/node-data-storage.js";
+import { createServerApiAuth } from "../api-auth.js";
 export function dataRoutes(deps) {
     const app = new Hono();
-    // Create middleware instances
-    const web3Auth = createWeb3AuthMiddleware({
+    const dataStorage = deps.dataStorage ??
+        createNodeDataStorage({
+            indexManager: deps.indexManager,
+            hierarchyOptions: deps.hierarchyOptions,
+        });
+    const auth = createServerApiAuth({
         serverOrigin: deps.serverOrigin,
-        devToken: deps.devToken,
         serverOwner: deps.serverOwner,
-    });
-    const builderCheck = createBuilderCheckMiddleware(deps.gateway);
-    const grantCheck = createGrantCheckMiddleware({
         gateway: deps.gateway,
-        serverOwner: deps.serverOwner,
-    });
-    const accessLog = createAccessLogMiddleware(deps.accessLogWriter);
-    // GET /v1/data/:scope/versions — list versions for a scope (requires auth + builder, no grant)
-    app.get("/:scope/versions", web3Auth, builderCheck, async (c) => {
-        // 1. Validate scope
-        const scopeParam = c.req.param("scope");
-        const scopeResult = ScopeSchema.safeParse(scopeParam);
-        if (!scopeResult.success) {
-            return c.json({
-                error: "INVALID_SCOPE",
-                message: scopeResult.error.issues[0].message,
-            }, 400);
-        }
-        const scope = scopeResult.data;
-        // 2. Parse pagination
-        const limit = c.req.query("limit")
-            ? parseInt(c.req.query("limit"), 10)
-            : 20;
-        const offset = c.req.query("offset")
-            ? parseInt(c.req.query("offset"), 10)
-            : 0;
-        // 3. Query index
-        const entries = deps.indexManager.findByScope({ scope, limit, offset });
-        const total = deps.indexManager.countByScope(scope);
-        // 4. Return response
-        return c.json({
-            scope,
-            versions: entries.map((e) => ({
-                fileId: e.fileId,
-                collectedAt: e.collectedAt,
-            })),
-            total,
-            limit,
-            offset,
-        });
-    });
-    // GET /v1/data — list distinct scopes (requires auth + builder, no grant)
-    app.get("/", web3Auth, builderCheck, async (c) => {
-        const scopePrefix = c.req.query("scopePrefix");
-        const limit = c.req.query("limit")
-            ? parseInt(c.req.query("limit"), 10)
-            : 20;
-        const offset = c.req.query("offset")
-            ? parseInt(c.req.query("offset"), 10)
-            : 0;
-        const result = deps.indexManager.listDistinctScopes({
-            scopePrefix: scopePrefix || undefined,
-            limit,
-            offset,
-        });
-        return c.json({
-            scopes: result.scopes,
-            total: result.total,
-            limit,
-            offset,
-        });
-    });
-    // GET /v1/data/:scope — read a data file (requires auth + grant)
-    app.get("/:scope", web3Auth, builderCheck, grantCheck, accessLog, async (c) => {
-        // 1. Validate scope
-        const scopeParam = c.req.param("scope");
-        const scopeResult = ScopeSchema.safeParse(scopeParam);
-        if (!scopeResult.success) {
-            return c.json({
-                error: "INVALID_SCOPE",
-                message: scopeResult.error.issues[0].message,
-            }, 400);
-        }
-        const scope = scopeResult.data;
-        // 2. Determine lookup strategy: fileId, at, or latest
-        const fileIdParam = c.req.query("fileId");
-        const atParam = c.req.query("at");
-        let entry;
-        if (fileIdParam) {
-            entry = deps.indexManager.findByFileId(fileIdParam);
-        }
-        else if (atParam) {
-            entry = deps.indexManager.findClosestByScope(scope, atParam);
-        }
-        else {
-            entry = deps.indexManager.findLatestByScope(scope);
-        }
-        // 3. 404 if not found
-        if (!entry) {
-            return c.json({
-                error: "NOT_FOUND",
-                message: `No data found for scope "${scope}"`,
-            }, 404);
-        }
-        // 4. Read the data file from disk
-        const envelope = await readDataFile(deps.hierarchyOptions, scope, entry.collectedAt);
-        // 5. Return 200 with envelope
-        return c.json(envelope);
+        devToken: deps.devToken,
+        accessToken: deps.accessToken,
+        tokenStore: deps.tokenStore,
+        dataStorage,
+        runtimeAvailability: deps.runtimeAvailability,
     });
     app.use("/:scope", createBodyLimit(DATA_INGEST_MAX_SIZE));
-    app.post("/:scope", async (c) => {
-        // 1. Parse & validate scope
-        const scopeParam = c.req.param("scope");
-        const scopeResult = ScopeSchema.safeParse(scopeParam);
-        if (!scopeResult.success) {
-            return c.json({
-                error: "INVALID_SCOPE",
-                message: scopeResult.error.issues[0].message,
-            }, 400);
-        }
-        const scope = scopeResult.data;
-        // 2. Parse JSON body
-        let body;
-        try {
-            body = await c.req.json();
-        }
-        catch {
-            return c.json({
-                error: "INVALID_BODY",
-                message: "Request body must be valid JSON",
-            }, 400);
-        }
-        if (body === null || typeof body !== "object" || Array.isArray(body)) {
-            return c.json({
-                error: "INVALID_BODY",
-                message: "Request body must be a JSON object",
-            }, 400);
-        }
-        // 3. Look up schema via Gateway (strict: reject if not found)
-        let schemaUrl;
-        try {
-            const schema = await deps.gateway.getSchemaForScope(scope);
-            if (!schema) {
-                return c.json({
-                    error: "NO_SCHEMA",
-                    message: `No schema registered for scope: ${scope}`,
-                }, 400);
-            }
-            schemaUrl = schema.definitionUrl;
-        }
-        catch (err) {
-            deps.logger.error({ err, scope }, "Gateway schema lookup failed");
-            return c.json({
-                error: "GATEWAY_ERROR",
-                message: "Failed to look up schema for scope",
-            }, 502);
-        }
-        // 4. Generate collectedAt
-        const collectedAt = generateCollectedAt();
-        // 5. Construct envelope
-        const envelope = createDataFileEnvelope(scope, collectedAt, body, schemaUrl);
-        // 6. Write atomically
-        const writeResult = await writeDataFile(deps.hierarchyOptions, envelope);
-        // 7. Insert into index
-        deps.indexManager.insert({
-            fileId: null,
-            path: writeResult.relativePath,
-            scope,
-            collectedAt,
-            sizeBytes: writeResult.sizeBytes,
-        });
-        deps.logger.info({ scope, collectedAt, path: writeResult.relativePath }, "Data file ingested");
-        // 8. Notify sync manager of new data (if enabled)
-        let status = "stored";
-        if (deps.syncManager) {
-            deps.syncManager.notifyNewData();
-            status = "syncing";
-        }
-        // 9. Return 201
-        return c.json({ scope, collectedAt, status }, 201);
-    });
-    // Owner-check middleware (web3-auth + owner-check)
-    const ownerCheck = createOwnerCheckMiddleware(deps.serverOwner);
-    // DELETE /v1/data/:scope — delete all versions for a scope (owner auth required)
-    app.delete("/:scope", web3Auth, ownerCheck, async (c) => {
-        // 1. Validate scope
-        const scopeParam = c.req.param("scope");
-        const scopeResult = ScopeSchema.safeParse(scopeParam);
-        if (!scopeResult.success) {
-            return c.json({
-                error: "INVALID_SCOPE",
-                message: scopeResult.error.issues[0].message,
-            }, 400);
-        }
-        const scope = scopeResult.data;
-        // 2. Delete from index
-        const deletedCount = deps.indexManager.deleteByScope(scope);
-        // 3. Delete from filesystem
-        await deleteAllForScope(deps.hierarchyOptions, scope);
-        deps.logger.info({ scope, deletedCount }, "Scope deleted");
-        // 4. Return 204
-        return c.body(null, 204);
-    });
+    app.all("*", (c) => handlePersonalServerDataRequest(c.req.raw, {
+        storage: dataStorage,
+        auth,
+        accessLogWriter: deps.accessLogWriter,
+        readFulfillmentReporter: deps.readFulfillmentReporter,
+        syncManager: deps.syncManager ?? null,
+        runtimeAvailability: deps.runtimeAvailability,
+        serverSigner: deps.serverSigner,
+        serverOwner: deps.serverOwner,
+        serverAddress: deps.serverAddress,
+        gateway: deps.gateway,
+        gatewayConfig: deps.gatewayConfig,
+        gatewayUrl: deps.gatewayUrl,
+        paymentEnabled: deps.paymentEnabled,
+        // Network identifier for the 402 challenge body. We use the chain
+        // id as the convention since the gateway is chain-scoped; clients
+        // dispatch on the (scheme, chainId) pair, not the human name.
+        network: deps.gatewayConfig
+            ? `vana:${deps.gatewayConfig.chainId}`
+            : undefined,
+        logger: deps.logger,
+    }, { basePath: deps.mountPath }));
     return app;
 }
 //# sourceMappingURL=data.js.map

package/dist/routes/data.js.map

@@ -1 +1 @@
-{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/routes/data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,8CAA8C,CAAC;AAC3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,yDAAyD,CAAC;AACjG,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,YAAY,EACZ,iBAAiB,GAClB,MAAM,yDAAyD,CAAC;AAOjE,OAAO,EACL,eAAe,EACf,oBAAoB,GACrB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAc1E,MAAM,UAAU,UAAU,CAAC,IAAmB;IAC5C,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IAEvB,8BAA8B;IAC9B,MAAM,QAAQ,GAAG,wBAAwB,CAAC;QACxC,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,WAAW,EAAE,IAAI,CAAC,WAAW;KAC9B,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,4BAA4B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAChE,MAAM,UAAU,GAAG,0BAA0B,CAAC;QAC5C,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,WAAW,EAAE,IAAI,CAAC,WAAW;KAC9B,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,yBAAyB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAElE,+FAA+F;IAC/F,GAAG,CAAC,GAAG,CAAC,kBAAkB,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC9D,oBAAoB;QACpB,MAAM,UAAU,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACxC,MAAM,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACtD,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YACzB,OAAO,CAAC,CAAC,IAAI,CACX;gBACE,KAAK,EAAE,eAAe;gBACtB,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO;aAC7C,EACD,GAAG,CACJ,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC;QAE/B,sBAAsB;QACtB,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;YAChC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAE,EAAE,EAAE,CAAC;YACrC,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC;YAClC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAE,EAAE,EAAE,CAAC;YACtC,CAAC,CAAC,CAAC,CAAC;QAEN,iBAAiB;QACjB,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QACxE,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAEpD,qBAAqB;QACrB,OAAO,CAAC,CAAC,IAAI,CAAC;YACZ,KAAK;YACL,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC5B,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,WAAW,EAAE,CAAC,CAAC,WAAW;aAC3B,CAAC,CAAC;YACH,KAAK;YACL,KAAK;YACL,MAAM;SACP,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,0EAA0E;IAC1E,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC/C,MAAM,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;YAChC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAE,EAAE,EAAE,CAAC;YACrC,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC;YAClC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAE,EAAE,EAAE,CAAC;YACtC,CAAC,CAAC,CAAC,CAAC;QAEN,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC;YAClD,WAAW,EAAE,WAAW,IAAI,SAAS;YACrC,KAAK;YACL,MAAM;SACP,CAAC,CAAC;QAEH,OAAO,CAAC,CAAC,IAAI,CAAC;YACZ,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,KAAK;YACL,MAAM;SACP,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,iEAAiE;IACjE,GAAG,CAAC,GAAG,CACL,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,UAAU,EACV,SAAS,EACT,KAAK,EAAE,CAAC,EAAE,EAAE;QACV,oBAAoB;QACpB,MAAM,UAAU,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACxC,MAAM,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACtD,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YACzB,OAAO,CAAC,CAAC,IAAI,CACX;gBACE,KAAK,EAAE,eAAe;gBACtB,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO;aAC7C,EACD,GAAG,CACJ,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC;QAE/B,sDAAsD;QACtD,MAAM,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC1C,MAAM,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAElC,IAAI,KAAK,CAAC;QACV,IAAI,WAAW,EAAE,CAAC;YAChB,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QACtD,CAAC;aAAM,IAAI,OAAO,EAAE,CAAC;YACnB,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC/D,CAAC;aAAM,CAAC;YACN,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACrD,CAAC;QAED,sBAAsB;QACtB,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,CAAC,CAAC,IAAI,CACX;gBACE,KAAK,EAAE,WAAW;gBAClB,OAAO,EAAE,4BAA4B,KAAK,GAAG;aAC9C,EACD,GAAG,CACJ,CAAC;QACJ,CAAC;QAED,kCAAkC;QAClC,MAAM,QAAQ,GAAG,MAAM,YAAY,CACjC,IAAI,CAAC,gBAAgB,EACrB,KAAK,EACL,KAAK,CAAC,WAAW,CAClB,CAAC;QAEF,8BAA8B;QAC9B,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC1B,CAAC,CACF,CAAC;IAEF,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAE1D,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC9B,4BAA4B;QAC5B,MAAM,UAAU,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACxC,MAAM,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACtD,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YACzB,OAAO,CAAC,CAAC,IAAI,CACX;gBACE,KAAK,EAAE,eAAe;gBACtB,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO;aAC7C,EACD,GAAG,CACJ,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC;QAE/B,qBAAqB;QACrB,IAAI,IAAa,CAAC;QAClB,IAAI,CAAC;YACH,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QAC5B,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,CAAC,CAAC,IAAI,CACX;gBACE,KAAK,EAAE,cAAc;gBACrB,OAAO,EAAE,iCAAiC;aAC3C,EACD,GAAG,CACJ,CAAC;QACJ,CAAC;QAED,IAAI,IAAI,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACrE,OAAO,CAAC,CAAC,IAAI,CACX;gBACE,KAAK,EAAE,cAAc;gBACrB,OAAO,EAAE,oCAAoC;aAC9C,EACD,GAAG,CACJ,CAAC;QACJ,CAAC;QAED,8DAA8D;QAC9D,IAAI,SAA6B,CAAC;QAClC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;YAC3D,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,OAAO,CAAC,CAAC,IAAI,CACX;oBACE,KAAK,EAAE,WAAW;oBAClB,OAAO,EAAE,mCAAmC,KAAK,EAAE;iBACpD,EACD,GAAG,CACJ,CAAC;YACJ,CAAC;YACD,SAAS,GAAG,MAAM,CAAC,aAAa,CAAC;QACnC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,8BAA8B,CAAC,CAAC;YAClE,OAAO,CAAC,CAAC,IAAI,CACX;gBACE,KAAK,EAAE,eAAe;gBACtB,OAAO,EAAE,oCAAoC;aAC9C,EACD,GAAG,CACJ,CAAC;QACJ,CAAC;QAED,0BAA0B;QAC1B,MAAM,WAAW,GAAG,mBAAmB,EAAE,CAAC;QAE1C,wBAAwB;QACxB,MAAM,QAAQ,GAAG,sBAAsB,CACrC,KAAK,EACL,WAAW,EACX,IAA+B,EAC/B,SAAS,CACV,CAAC;QAEF,sBAAsB;QACtB,MAAM,WAAW,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QAEzE,uBAAuB;QACvB,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC;YACvB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,WAAW,CAAC,YAAY;YAC9B,KAAK;YACL,WAAW;YACX,SAAS,EAAE,WAAW,CAAC,SAAS;SACjC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,CAAC,YAAY,EAAE,EACtD,oBAAoB,CACrB,CAAC;QAEF,kDAAkD;QAClD,IAAI,MAAM,GAAyB,QAAQ,CAAC;QAC5C,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC;YACjC,MAAM,GAAG,SAAS,CAAC;QACrB,CAAC;QAED,gBAAgB;QAChB,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;IAEH,mDAAmD;IACnD,MAAM,UAAU,GAAG,0BAA0B,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAEhE,iFAAiF;IACjF,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACtD,oBAAoB;QACpB,MAAM,UAAU,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACxC,MAAM,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACtD,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YACzB,OAAO,CAAC,CAAC,IAAI,CACX;gBACE,KAAK,EAAE,eAAe;gBACtB,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO;aAC7C,EACD,GAAG,CACJ,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC;QAE/B,uBAAuB;QACvB,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAE5D,4BAA4B;QAC5B,MAAM,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;QAEtD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,eAAe,CAAC,CAAC;QAE3D,gBAAgB;QAChB,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/routes/data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EACL,+BAA+B,GAGhC,MAAM,2CAA2C,CAAC;AAgBnD,OAAO,EACL,eAAe,EACf,oBAAoB,GACrB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAmDrD,MAAM,UAAU,UAAU,CAAC,IAAmB;IAC5C,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IAEvB,MAAM,WAAW,GACf,IAAI,CAAC,WAAW;QAChB,qBAAqB,CAAC;YACpB,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;SACxC,CAAC,CAAC;IACL,MAAM,IAAI,GAAG,mBAAmB,CAAC;QAC/B,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,WAAW;QACX,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;KAC9C,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAC1D,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CACjB,+BAA+B,CAC7B,CAAC,CAAC,GAAG,CAAC,GAAG,EACT;QACE,OAAO,EAAE,WAAW;QACpB,IAAI;QACJ,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,uBAAuB,EAAE,IAAI,CAAC,uBAAuB;QACrD,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,IAAI;QACrC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;QAC7C,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,cAAc,EAAE,IAAI,CAAC,cAAc;QACnC,kEAAkE;QAClE,kEAAkE;QAClE,8DAA8D;QAC9D,OAAO,EAAE,IAAI,CAAC,aAAa;YACzB,CAAC,CAAC,QAAQ,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE;YACtC,CAAC,CAAC,SAAS;QACb,MAAM,EAAE,IAAI,CAAC,MAAM;KACpB,EACD,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,CAC7B,CACF,CAAC;IAEF,OAAO,GAAG,CAAC;AACb,CAAC"}

package/dist/routes/grants.d.ts

@@ -1,17 +1,24 @@
 /**
- * Grants routes — GET / (owner), POST / (create grant), POST /verify (public).
+ * Grants routes — GET / (owner), POST / (create grant), DELETE /:grantId
+ * (revoke grant), POST /verify (public).
  */
 import { Hono } from "hono";
 import type { Logger } from "pino";
-import type { GatewayClient } from "@opendatalabs/personal-server-ts-core/gateway";
+import type { DataPortabilityGatewayConfig, GatewayClient } from "@opendatalabs/vana-sdk/node";
+import { type PersonalServerApiDispatchOptions } from "@opendatalabs/personal-server-ts-core/api";
 import type { ServerSigner } from "@opendatalabs/personal-server-ts-core/signing";
+import type { TokenStore } from "../token-store.js";
 export interface GrantsRouteDeps {
     logger: Logger;
     gateway: GatewayClient;
+    gatewayConfig?: DataPortabilityGatewayConfig;
     serverOwner?: `0x${string}`;
     serverOrigin: string | (() => string);
     devToken?: string;
+    accessToken?: string;
+    tokenStore?: TokenStore;
     serverSigner?: ServerSigner;
+    mountPath?: PersonalServerApiDispatchOptions["basePath"];
 }
 export declare function grantsRoutes(deps: GrantsRouteDeps): Hono;
 //# sourceMappingURL=grants.d.ts.map

package/dist/routes/grants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grants.d.ts","sourceRoot":"","sources":["../../src/routes/grants.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAEnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AAKnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAC;AAIlF,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,aAAa,CAAC;IACvB,WAAW,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;IAC5B,YAAY,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC;IACtC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAoED,wBAAgB,YAAY,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,CAwMxD"}
+{"version":3,"file":"grants.d.ts","sourceRoot":"","sources":["../../src/routes/grants.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,IAAI,EAAgB,MAAM,MAAM,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,KAAK,EACV,4BAA4B,EAC5B,aAAa,EACd,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEL,KAAK,gCAAgC,EACtC,MAAM,2CAA2C,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAGpD,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,aAAa,CAAC;IACvB,aAAa,CAAC,EAAE,4BAA4B,CAAC;IAC7C,WAAW,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;IAC5B,YAAY,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC;IACtC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,SAAS,CAAC,EAAE,gCAAgC,CAAC,UAAU,CAAC,CAAC;CAC1D;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,CA8BxD"}

package/dist/routes/grants.js

@@ -1,208 +1,30 @@
 /**
- * Grants routes — GET / (owner), POST / (create grant), POST /verify (public).
+ * Grants routes — GET / (owner), POST / (create grant), DELETE /:grantId
+ * (revoke grant), POST /verify (public).
  */
 import { Hono } from "hono";
-import { verifyTypedData } from "viem";
-import { GRANT_DOMAIN, GRANT_TYPES, } from "@opendatalabs/personal-server-ts-core/grants";
-import { createWeb3AuthMiddleware } from "../middleware/web3-auth.js";
-import { createOwnerCheckMiddleware } from "../middleware/owner-check.js";
-function isValidCreateBody(body) {
-    if (body === null || typeof body !== "object" || Array.isArray(body))
-        return false;
-    const b = body;
-    if (typeof b.granteeAddress !== "string" ||
-        !b.granteeAddress.startsWith("0x"))
-        return false;
-    if (!Array.isArray(b.scopes) || b.scopes.length === 0)
-        return false;
-    if (!b.scopes.every((s) => typeof s === "string"))
-        return false;
-    if (b.expiresAt !== undefined && typeof b.expiresAt !== "number")
-        return false;
-    if (b.nonce !== undefined && typeof b.nonce !== "number")
-        return false;
-    return true;
-}
-function isValidVerifyBody(body) {
-    if (body === null || typeof body !== "object" || Array.isArray(body))
-        return false;
-    const b = body;
-    if (typeof b.grantId !== "string" || b.grantId.length === 0)
-        return false;
-    if (typeof b.signature !== "string" || !b.signature.startsWith("0x"))
-        return false;
-    if (b.payload === null ||
-        typeof b.payload !== "object" ||
-        Array.isArray(b.payload))
-        return false;
-    const p = b.payload;
-    if (typeof p.user !== "string" || !p.user.startsWith("0x"))
-        return false;
-    if (typeof p.builder !== "string" || !p.builder.startsWith("0x"))
-        return false;
-    if (!Array.isArray(p.scopes) || p.scopes.length === 0)
-        return false;
-    if (!p.scopes.every((s) => typeof s === "string"))
-        return false;
-    if (typeof p.expiresAt !== "number")
-        return false;
-    if (typeof p.nonce !== "number")
-        return false;
-    return true;
-}
+import { handlePersonalServerGrantsRequest, } from "@opendatalabs/personal-server-ts-core/api";
+import { createServerApiAuth } from "../api-auth.js";
 export function grantsRoutes(deps) {
     const app = new Hono();
-    const web3Auth = createWeb3AuthMiddleware({
+    const auth = createServerApiAuth({
         serverOrigin: deps.serverOrigin,
         devToken: deps.devToken,
+        accessToken: deps.accessToken,
+        tokenStore: deps.tokenStore,
         serverOwner: deps.serverOwner,
+        gateway: deps.gateway,
     });
-    const ownerCheck = createOwnerCheckMiddleware(deps.serverOwner);
-    // GET / — list all grants for the server owner (owner auth required)
-    app.get("/", web3Auth, ownerCheck, async (c) => {
-        if (!deps.serverOwner) {
-            return c.json({
-                error: {
-                    code: 500,
-                    errorCode: "SERVER_NOT_CONFIGURED",
-                    message: "Server owner address not configured. Set VANA_MASTER_KEY_SIGNATURE environment variable.",
-                },
-            }, 500);
-        }
-        const grants = await deps.gateway.listGrantsByUser(deps.serverOwner);
-        return c.json({ grants });
-    });
-    // POST / — create a grant (owner-only, called by Desktop App)
-    app.post("/", web3Auth, ownerCheck, async (c) => {
-        if (!deps.serverOwner) {
-            return c.json({
-                error: {
-                    code: 500,
-                    errorCode: "SERVER_NOT_CONFIGURED",
-                    message: "Server owner address not configured. Set VANA_MASTER_KEY_SIGNATURE environment variable.",
-                },
-            }, 500);
-        }
-        if (!deps.serverSigner) {
-            return c.json({
-                error: {
-                    code: 500,
-                    errorCode: "SERVER_SIGNER_NOT_CONFIGURED",
-                    message: "Server signer not configured. Set VANA_MASTER_KEY_SIGNATURE environment variable.",
-                },
-            }, 500);
-        }
-        let body;
-        try {
-            body = await c.req.json();
-        }
-        catch {
-            return c.json({ error: "INVALID_BODY", message: "Invalid JSON body" }, 400);
-        }
-        if (!isValidCreateBody(body)) {
-            return c.json({
-                error: "INVALID_BODY",
-                message: "Body must include granteeAddress (0x string) and scopes (non-empty string array)",
-            }, 400);
-        }
-        const { granteeAddress, scopes, expiresAt, nonce } = body;
-        // Look up builder to get their on-chain ID
-        const builder = await deps.gateway.getBuilder(granteeAddress);
-        if (!builder) {
-            return c.json({
-                error: {
-                    code: 404,
-                    errorCode: "BUILDER_NOT_REGISTERED",
-                    message: `Builder ${granteeAddress} is not registered on-chain`,
-                },
-            }, 404);
-        }
-        // Build the grant payload JSON string
-        const grantPayload = JSON.stringify({
-            user: deps.serverOwner,
-            builder: granteeAddress,
-            scopes,
-            expiresAt: expiresAt ?? 0,
-            nonce: nonce ?? Date.now(),
-        });
-        // Sign EIP-712 GrantRegistration
-        const signature = await deps.serverSigner.signGrantRegistration({
-            grantorAddress: deps.serverOwner,
-            granteeId: builder.id,
-            grant: grantPayload,
-            fileIds: [],
-        });
-        // Submit to Gateway
-        const result = await deps.gateway.createGrant({
-            grantorAddress: deps.serverOwner,
-            granteeId: builder.id,
-            grant: grantPayload,
-            fileIds: [],
-            signature,
-        });
-        return c.json({ grantId: result.grantId }, 201);
-    });
-    // POST /verify — public endpoint, no auth required
-    app.post("/verify", async (c) => {
-        let body;
-        try {
-            body = await c.req.json();
-        }
-        catch {
-            return c.json({ error: "INVALID_BODY", message: "Invalid JSON body" }, 400);
-        }
-        if (!isValidVerifyBody(body)) {
-            return c.json({
-                error: "INVALID_BODY",
-                message: "Body must include grantId (string), payload (object with user, builder, scopes, expiresAt, nonce), and signature (0x string)",
-            }, 400);
-        }
-        const { payload, signature } = body;
-        // Verify EIP-712 signature — recover signer and check === payload.user
-        let valid;
-        try {
-            valid = await verifyTypedData({
-                address: payload.user,
-                domain: GRANT_DOMAIN,
-                types: GRANT_TYPES,
-                primaryType: "Grant",
-                message: {
-                    user: payload.user,
-                    builder: payload.builder,
-                    scopes: payload.scopes,
-                    expiresAt: BigInt(payload.expiresAt),
-                    nonce: BigInt(payload.nonce),
-                },
-                signature: signature,
-            });
-        }
-        catch {
-            return c.json({
-                valid: false,
-                error: "EIP-712 signature verification failed",
-            });
-        }
-        if (!valid) {
-            return c.json({
-                valid: false,
-                error: "Grant signature does not match user",
-            });
-        }
-        // Check expiry: expiresAt > 0 means there IS an expiry
-        if (payload.expiresAt > 0) {
-            const nowSeconds = Math.floor(Date.now() / 1000);
-            if (payload.expiresAt < nowSeconds) {
-                return c.json({ valid: false, error: "Grant has expired" });
-            }
-        }
-        return c.json({
-            valid: true,
-            user: payload.user,
-            builder: payload.builder,
-            scopes: payload.scopes,
-            expiresAt: payload.expiresAt,
-        });
-    });
+    const handler = (c) => handlePersonalServerGrantsRequest(c.req.raw, {
+        auth,
+        gateway: deps.gateway,
+        gatewayConfig: deps.gatewayConfig,
+        serverOwner: deps.serverOwner,
+        serverSigner: deps.serverSigner,
+    }, { basePath: deps.mountPath });
+    app.all("/", handler);
+    app.delete("/:grantId", handler);
+    app.all("/*", handler);
     return app;
 }
 //# sourceMappingURL=grants.js.map

package/dist/routes/grants.js.map

@@ -1 +1 @@
-{"version":3,"file":"grants.js","sourceRoot":"","sources":["../../src/routes/grants.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAEvC,OAAO,EACL,YAAY,EACZ,WAAW,GACZ,MAAM,8CAA8C,CAAC;AAEtD,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AA8B1E,SAAS,iBAAiB,CAAC,IAAa;IACtC,IAAI,IAAI,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QAClE,OAAO,KAAK,CAAC;IACf,MAAM,CAAC,GAAG,IAA+B,CAAC;IAE1C,IACE,OAAO,CAAC,CAAC,cAAc,KAAK,QAAQ;QACpC,CAAC,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC;QAElC,OAAO,KAAK,CAAC;IACf,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACpE,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC;QAAE,OAAO,KAAK,CAAC;IACzE,IAAI,CAAC,CAAC,SAAS,KAAK,SAAS,IAAI,OAAO,CAAC,CAAC,SAAS,KAAK,QAAQ;QAC9D,OAAO,KAAK,CAAC;IACf,IAAI,CAAC,CAAC,KAAK,KAAK,SAAS,IAAI,OAAO,CAAC,CAAC,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAEvE,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAa;IACtC,IAAI,IAAI,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QAClE,OAAO,KAAK,CAAC;IACf,MAAM,CAAC,GAAG,IAA+B,CAAC;IAE1C,IAAI,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC1E,IAAI,OAAO,CAAC,CAAC,SAAS,KAAK,QAAQ,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC;QAClE,OAAO,KAAK,CAAC;IAEf,IACE,CAAC,CAAC,OAAO,KAAK,IAAI;QAClB,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ;QAC7B,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;QAExB,OAAO,KAAK,CAAC;IACf,MAAM,CAAC,GAAG,CAAC,CAAC,OAAkC,CAAC;IAE/C,IAAI,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IACzE,IAAI,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC;QAC9D,OAAO,KAAK,CAAC;IACf,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACpE,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC;QAAE,OAAO,KAAK,CAAC;IACzE,IAAI,OAAO,CAAC,CAAC,SAAS,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAClD,IAAI,OAAO,CAAC,CAAC,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAE9C,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,IAAqB;IAChD,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IAEvB,MAAM,QAAQ,GAAG,wBAAwB,CAAC;QACxC,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,WAAW,EAAE,IAAI,CAAC,WAAW;KAC9B,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,0BAA0B,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAEhE,qEAAqE;IACrE,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC7C,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,OAAO,CAAC,CAAC,IAAI,CACX;gBACE,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG;oBACT,SAAS,EAAE,uBAAuB;oBAClC,OAAO,EACL,0FAA0F;iBAC7F;aACF,EACD,GAAG,CACJ,CAAC;QACJ,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACrE,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,8DAA8D;IAC9D,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC9C,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,OAAO,CAAC,CAAC,IAAI,CACX;gBACE,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG;oBACT,SAAS,EAAE,uBAAuB;oBAClC,OAAO,EACL,0FAA0F;iBAC7F;aACF,EACD,GAAG,CACJ,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,OAAO,CAAC,CAAC,IAAI,CACX;gBACE,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG;oBACT,SAAS,EAAE,8BAA8B;oBACzC,OAAO,EACL,mFAAmF;iBACtF;aACF,EACD,GAAG,CACJ,CAAC;QACJ,CAAC;QAED,IAAI,IAAa,CAAC;QAClB,IAAI,CAAC;YACH,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QAC5B,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,CAAC,CAAC,IAAI,CACX,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,mBAAmB,EAAE,EACvD,GAAG,CACJ,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,OAAO,CAAC,CAAC,IAAI,CACX;gBACE,KAAK,EAAE,cAAc;gBACrB,OAAO,EACL,kFAAkF;aACrF,EACD,GAAG,CACJ,CAAC;QACJ,CAAC;QAED,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QAE1D,2CAA2C;QAC3C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QAC9D,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,CAAC,CAAC,IAAI,CACX;gBACE,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG;oBACT,SAAS,EAAE,wBAAwB;oBACnC,OAAO,EAAE,WAAW,cAAc,6BAA6B;iBAChE;aACF,EACD,GAAG,CACJ,CAAC;QACJ,CAAC;QAED,sCAAsC;QACtC,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC;YAClC,IAAI,EAAE,IAAI,CAAC,WAAW;YACtB,OAAO,EAAE,cAAc;YACvB,MAAM;YACN,SAAS,EAAE,SAAS,IAAI,CAAC;YACzB,KAAK,EAAE,KAAK,IAAI,IAAI,CAAC,GAAG,EAAE;SAC3B,CAAC,CAAC;QAEH,iCAAiC;QACjC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC;YAC9D,cAAc,EAAE,IAAI,CAAC,WAAW;YAChC,SAAS,EAAE,OAAO,CAAC,EAAmB;YACtC,KAAK,EAAE,YAAY;YACnB,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;QAEH,oBAAoB;QACpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;YAC5C,cAAc,EAAE,IAAI,CAAC,WAAW;YAChC,SAAS,EAAE,OAAO,CAAC,EAAE;YACrB,KAAK,EAAE,YAAY;YACnB,OAAO,EAAE,EAAE;YACX,SAAS;SACV,CAAC,CAAC;QAEH,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,mDAAmD;IACnD,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC9B,IAAI,IAAa,CAAC;QAClB,IAAI,CAAC;YACH,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QAC5B,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,CAAC,CAAC,IAAI,CACX,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,mBAAmB,EAAE,EACvD,GAAG,CACJ,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,OAAO,CAAC,CAAC,IAAI,CACX;gBACE,KAAK,EAAE,cAAc;gBACrB,OAAO,EACL,8HAA8H;aACjI,EACD,GAAG,CACJ,CAAC;QACJ,CAAC;QAED,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QAEpC,uEAAuE;QACvE,IAAI,KAAc,CAAC;QACnB,IAAI,CAAC;YACH,KAAK,GAAG,MAAM,eAAe,CAAC;gBAC5B,OAAO,EAAE,OAAO,CAAC,IAAqB;gBACtC,MAAM,EAAE,YAAY;gBACpB,KAAK,EAAE,WAAW;gBAClB,WAAW,EAAE,OAAgB;gBAC7B,OAAO,EAAE;oBACP,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;oBACpC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;iBAC7B;gBACD,SAAS,EAAE,SAA0B;aACtC,CAAC,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,CAAC,CAAC,IAAI,CAAC;gBACZ,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,uCAAuC;aAC/C,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,CAAC,CAAC,IAAI,CAAC;gBACZ,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,qCAAqC;aAC7C,CAAC,CAAC;QACL,CAAC;QAED,uDAAuD;QACvD,IAAI,OAAO,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC;YAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;YACjD,IAAI,OAAO,CAAC,SAAS,GAAG,UAAU,EAAE,CAAC;gBACnC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC,CAAC;YAC9D,CAAC;QACH,CAAC;QAED,OAAO,CAAC,CAAC,IAAI,CAAC;YACZ,KAAK,EAAE,IAAI;YACX,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,SAAS,EAAE,OAAO,CAAC,SAAS;SAC7B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"grants.js","sourceRoot":"","sources":["../../src/routes/grants.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,IAAI,EAAgB,MAAM,MAAM,CAAC;AAM1C,OAAO,EACL,iCAAiC,GAElC,MAAM,2CAA2C,CAAC;AAGnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAerD,MAAM,UAAU,YAAY,CAAC,IAAqB;IAChD,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IAEvB,MAAM,IAAI,GAAG,mBAAmB,CAAC;QAC/B,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;KACtB,CAAC,CAAC;IAEH,MAAM,OAAO,GAAY,CAAC,CAAC,EAAE,EAAE,CAC7B,iCAAiC,CAC/B,CAAC,CAAC,GAAG,CAAC,GAAG,EACT;QACE,IAAI;QACJ,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,YAAY,EAAE,IAAI,CAAC,YAAY;KAChC,EACD,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,CAC7B,CAAC;IAEJ,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACtB,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACjC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEvB,OAAO,GAAG,CAAC;AACb,CAAC"}

package/dist/routes/health.d.ts

@@ -1,16 +1,22 @@
 import { Hono } from "hono";
-import type { GatewayClient } from "@opendatalabs/personal-server-ts-core/gateway";
+import type { DataPortabilityGatewayConfig, GatewayClient } from "@opendatalabs/vana-sdk/node";
+import type { RuntimeAvailabilityPort } from "@opendatalabs/personal-server-ts-core/ports";
 import type { Logger } from "pino";
 import type { IdentityInfo } from "../app.js";
 import type { TunnelStatusInfo } from "../tunnel/index.js";
 export interface HealthDeps {
     version: string;
     startedAt: Date;
+    serverOrigin?: string | (() => string);
     serverOwner?: `0x${string}`;
     identity?: IdentityInfo;
     gateway?: GatewayClient;
+    gatewayConfig?: DataPortabilityGatewayConfig & {
+        url?: string;
+    };
     logger?: Logger;
     getTunnelStatus?: () => TunnelStatusInfo | null;
+    runtimeAvailability?: RuntimeAvailabilityPort;
 }
 export declare function healthRoute(deps: HealthDeps): Hono;
 //# sourceMappingURL=health.d.ts.map

package/dist/routes/health.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"health.d.ts","sourceRoot":"","sources":["../../src/routes/health.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAEnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;IAChB,WAAW,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;IAC5B,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,gBAAgB,GAAG,IAAI,CAAC;CACjD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CA0ClD"}
+{"version":3,"file":"health.d.ts","sourceRoot":"","sources":["../../src/routes/health.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EACV,4BAA4B,EAC5B,aAAa,EACd,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6CAA6C,CAAC;AAC3F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAEnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC;IACvC,WAAW,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;IAC5B,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,aAAa,CAAC,EAAE,4BAA4B,GAAG;QAAE,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAChE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,gBAAgB,GAAG,IAAI,CAAC;IAChD,mBAAmB,CAAC,EAAE,uBAAuB,CAAC;CAC/C;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAsFlD"}

package/dist/routes/health.js

@@ -22,14 +22,51 @@ export function healthRoute(deps) {
                 serverId,
             }
             : null;
-        const tunnel = deps.getTunnelStatus?.() ?? null;
+        const tunnelStatus = deps.getTunnelStatus?.() ?? null;
+        const fallbackOrigin = typeof deps.serverOrigin === "function"
+            ? deps.serverOrigin()
+            : deps.serverOrigin;
+        const tunnelPublicUrl = tunnelStatus?.publicUrl ?? null;
+        const tunnelReady = tunnelStatus?.status === "connected" && tunnelStatus.routable !== false;
+        const apiOrigin = tunnelReady && tunnelPublicUrl
+            ? tunnelPublicUrl
+            : (fallbackOrigin ?? null);
+        const registrationUrl = tunnelPublicUrl ?? apiOrigin;
+        const registration = deps.serverOwner && identity && registrationUrl
+            ? {
+                ownerAddress: deps.serverOwner,
+                serverAddress: identity.address,
+                publicKey: identity.publicKey,
+                serverUrl: registrationUrl,
+                serverId,
+                registered: Boolean(serverId),
+            }
+            : null;
+        const tunnel = tunnelStatus && registration && tunnelStatus.publicUrl
+            ? {
+                ...tunnelStatus,
+                routable: registration.registered && tunnelStatus.routable !== false,
+                warning: registration.registered
+                    ? tunnelStatus.warning
+                    : "Server not registered with gateway",
+            }
+            : tunnelStatus;
+        const runtimeAvailable = (await deps.runtimeAvailability?.isAvailable()) ?? true;
         return c.json({
-            status: "healthy",
+            status: runtimeAvailable ? "healthy" : "unavailable",
             version: deps.version,
             uptime: Math.floor(uptimeMs / 1000),
             owner: deps.serverOwner ?? null,
+            apiOrigin,
+            gatewayUrl: deps.gatewayConfig?.url ?? null,
+            gatewayConfig: deps.gatewayConfig ?? null,
             identity,
+            registration,
             tunnel,
+            runtime: {
+                kind: "ps-node",
+                available: runtimeAvailable,
+            },
         });
     });
     return app;