@highstate/backend-api 0.21.1 → 0.26.0

package/dist/highstate.manifest.json

@@ -1,5 +1,5 @@
 {
   "sourceHashes": {
-    "./dist/index.js": 3068331074
+    "./dist/index.js": 575062251
   }
 }

package/dist/index.js

@@ -2,6 +2,7 @@
 // src/index.ts
 import { rm } from "fs/promises";
 import { InstanceServiceDefinition } from "@highstate/api/instance.v1";
+import { PanelServiceDefinition } from "@highstate/api/panel.v1";
 import { SecretServiceDefinition } from "@highstate/api/secret.v1";
 import { WorkerServiceDefinition } from "@highstate/api/worker.v1";
 import { createServer } from "nice-grpc";
@@ -73,6 +74,23 @@ function createInstanceService(services) {
   };
 }
 
+// src/handlers/panel.ts
+import { panelInputSchema } from "@highstate/backend/shared";
+import { z as z2 } from "@highstate/contract";
+function createPanelService(services) {
+  return {
+    async setUnitPanels(request, context) {
+      const [projectId, apiKey] = await authenticate(services, context);
+      const workerVersionId = parseArgument(request, "workerVersionId", z2.cuid2());
+      const workerInstanceId = parseArgument(request, "workerInstanceId", z2.cuid2());
+      const stateId = parseArgument(request, "stateId", z2.cuid2());
+      const panels = parseArgument(request, "panels", z2.array(panelInputSchema));
+      const panelIds = await services.panelService.setUnitPanels(projectId, stateId, apiKey.id, workerVersionId, panels, workerInstanceId);
+      return { panelIds };
+    }
+  };
+}
+
 // src/handlers/secret.ts
 function createSecretService(services) {
   return {
@@ -84,10 +102,10 @@ function createSecretService(services) {
 }
 
 // src/handlers/worker.ts
-import { commonObjectMetaSchema, serviceAccountMetaSchema, z as z2 } from "@highstate/contract";
-var workerMetaUpdatePayloadSchema = z2.union([
+import { commonObjectMetaSchema, serviceAccountMetaSchema, z as z3 } from "@highstate/contract";
+var workerMetaUpdatePayloadSchema = z3.union([
   commonObjectMetaSchema,
-  z2.object({
+  z3.object({
     workerMeta: commonObjectMetaSchema,
     serviceAccountMeta: serviceAccountMetaSchema
   })
@@ -95,56 +113,66 @@ var workerMetaUpdatePayloadSchema = z2.union([
 function createWorkerService(services) {
   return {
     async* connect(request, context) {
-      const [projectId] = await authenticate(services, context);
-      const workerVersionId = parseArgument(request, "workerVersionId", z2.cuid2());
-      services.workerManager.setWorkerRunning(projectId, workerVersionId);
+      const [projectId, apiKey] = await authenticate(services, context);
+      const workerVersionId = parseArgument(request, "workerVersionId", z3.cuid2());
+      const workerInstanceId = parseArgument(request, "workerInstanceId", z3.cuid2());
+      const dataEndpoint = parseArgument(request, "dataEndpoint", z3.string().min(1));
       const database = await services.database.forProject(projectId);
-      const existingRegistrations = await database.workerUnitRegistration.findMany({
-        where: { workerVersionId },
-        select: { stateId: true, params: true }
+      const workerVersion = await database.workerVersion.findFirst({
+        where: { id: workerVersionId, apiKeyId: apiKey.id },
+        select: { id: true }
       });
-      for (const registration of existingRegistrations) {
-        yield {
-          event: {
-            $case: "unitRegistration",
-            value: {
-              stateId: registration.stateId,
-              params: registration.params
-            }
-          }
-        };
+      if (!workerVersion) {
+        throw new Error(`Worker version "${workerVersionId}" is not owned by the API key`);
       }
-      const registrationStream = await services.pubsubManager.subscribe([
-        "worker-unit-registration",
-        projectId,
-        workerVersionId
-      ]);
-      for await (const event of registrationStream) {
-        if (event.type === "registered") {
+      services.workerManager.assertWorkerInstance(projectId, workerVersionId, workerInstanceId);
+      services.panelEndpointManager.connect(projectId, workerVersionId, workerInstanceId, dataEndpoint);
+      try {
+        await services.workerManager.setWorkerRunning(projectId, workerVersionId, workerInstanceId);
+        const existingRegistrations = await database.workerUnitRegistration.findMany({
+          where: { workerVersionId },
+          select: { stateId: true, params: true }
+        });
+        for (const registration of existingRegistrations) {
           yield {
             event: {
               $case: "unitRegistration",
               value: {
-                instanceId: event.instanceId,
-                params: event.params
+                stateId: registration.stateId,
+                params: registration.params
               }
             }
           };
-        } else if (event.type === "deregistered") {
-          yield {
-            event: {
-              $case: "unitDeregistration",
-              value: {
-                instanceId: event.instanceId
+        }
+        const registrationStream = await services.pubsubManager.subscribe([
+          "worker-unit-registration",
+          projectId,
+          workerVersionId
+        ]);
+        for await (const event of registrationStream) {
+          if (event.type === "registered") {
+            yield {
+              event: {
+                $case: "unitRegistration",
+                value: { stateId: event.stateId, params: event.params }
               }
-            }
-          };
+            };
+          } else if (event.type === "deregistered") {
+            yield {
+              event: {
+                $case: "unitDeregistration",
+                value: { stateId: event.stateId }
+              }
+            };
+          }
         }
+      } finally {
+        services.panelEndpointManager.disconnect(workerInstanceId);
       }
     },
     async updateWorkerVersionMeta(request, context) {
       const [projectId] = await authenticate(services, context);
-      const workerVersionId = parseArgument(request, "workerVersionId", z2.string());
+      const workerVersionId = parseArgument(request, "workerVersionId", z3.string());
       const payload = parseArgument(request, "meta", workerMetaUpdatePayloadSchema);
       const workerMeta = "workerMeta" in payload ? payload.workerMeta : payload;
       const serviceAccountMeta = "serviceAccountMeta" in payload ? payload.serviceAccountMeta : undefined;
@@ -159,6 +187,7 @@ async function startBackedApi(services) {
   const server = createServer();
   server.use(createErrorHandlingMiddleware(services));
   server.add(InstanceServiceDefinition, createInstanceService(services));
+  server.add(PanelServiceDefinition, createPanelService(services));
   server.add(SecretServiceDefinition, createSecretService(services));
   server.add(WorkerServiceDefinition, createWorkerService(services));
   const uid = process.geteuid?.();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/backend-api",
-  "version": "0.21.1",
+  "version": "0.26.0",
   "type": "module",
   "files": [
     "dist",
@@ -41,10 +41,10 @@
   },
   "dependencies": {
     "@bufbuild/protobuf": "^2.6.1",
-    "@highstate/api": "0.20.0",
-    "@highstate/backend": "0.20.0",
-    "@highstate/cli": "0.20.0",
-    "@highstate/contract": "0.20.0",
+    "@highstate/api": "0.25.0",
+    "@highstate/backend": "0.25.0",
+    "@highstate/cli": "0.25.0",
+    "@highstate/contract": "0.25.0",
     "abort-controller-x": "^0.4.3",
     "nice-grpc": "^2.1.12",
     "nice-grpc-common": "^2.0.2",

package/src/handlers/panel.ts

@@ -0,0 +1,28 @@
+import type { PanelServiceImplementation } from "@highstate/api/panel.v1"
+import type { Services } from "@highstate/backend"
+import { panelInputSchema } from "@highstate/backend/shared"
+import { z } from "@highstate/contract"
+import { authenticate, parseArgument } from "../shared"
+
+export function createPanelService(services: Services): PanelServiceImplementation {
+  return {
+    async setUnitPanels(request, context) {
+      const [projectId, apiKey] = await authenticate(services, context)
+      const workerVersionId = parseArgument(request, "workerVersionId", z.cuid2())
+      const workerInstanceId = parseArgument(request, "workerInstanceId", z.cuid2())
+      const stateId = parseArgument(request, "stateId", z.cuid2())
+      const panels = parseArgument(request, "panels", z.array(panelInputSchema))
+
+      const panelIds = await services.panelService.setUnitPanels(
+        projectId,
+        stateId,
+        apiKey.id,
+        workerVersionId,
+        panels,
+        workerInstanceId,
+      )
+
+      return { panelIds }
+    },
+  }
+}

package/src/handlers/worker.ts

@@ -14,62 +14,69 @@ const workerMetaUpdatePayloadSchema = z.union([
 export function createWorkerService(services: Services): WorkerServiceImplementation {
   return {
     async *connect(request, context) {
-      const [projectId] = await authenticate(services, context)
+      const [projectId, apiKey] = await authenticate(services, context)
 
       const workerVersionId = parseArgument(request, "workerVersionId", z.cuid2())
-
-      // set worker as running
-      services.workerManager.setWorkerRunning(projectId, workerVersionId)
-
-      // get existing registrations for this worker version
+      const workerInstanceId = parseArgument(request, "workerInstanceId", z.cuid2())
+      const dataEndpoint = parseArgument(request, "dataEndpoint", z.string().min(1))
       const database = await services.database.forProject(projectId)
-      const existingRegistrations = await database.workerUnitRegistration.findMany({
-        where: { workerVersionId },
-        select: { stateId: true, params: true },
+      const workerVersion = await database.workerVersion.findFirst({
+        where: { id: workerVersionId, apiKeyId: apiKey.id },
+        select: { id: true },
       })
-
-      // emit existing registrations
-      for (const registration of existingRegistrations) {
-        yield {
-          event: {
-            $case: "unitRegistration",
-            value: {
-              stateId: registration.stateId,
-              params: registration.params,
-            },
-          },
-        }
+      if (!workerVersion) {
+        throw new Error(`Worker version "${workerVersionId}" is not owned by the API key`)
       }
 
-      // subscribe to new registration events for this worker version
-      const registrationStream = await services.pubsubManager.subscribe([
-        "worker-unit-registration",
+      services.workerManager.assertWorkerInstance(projectId, workerVersionId, workerInstanceId)
+      services.panelEndpointManager.connect(
         projectId,
         workerVersionId,
-      ])
+        workerInstanceId,
+        dataEndpoint,
+      )
 
-      // emit new registration/deregistration events
-      for await (const event of registrationStream) {
-        if (event.type === "registered") {
+      try {
+        await services.workerManager.setWorkerRunning(projectId, workerVersionId, workerInstanceId)
+        const existingRegistrations = await database.workerUnitRegistration.findMany({
+          where: { workerVersionId },
+          select: { stateId: true, params: true },
+        })
+        for (const registration of existingRegistrations) {
           yield {
             event: {
               $case: "unitRegistration",
               value: {
-                instanceId: event.instanceId,
-                params: event.params,
+                stateId: registration.stateId,
+                params: registration.params,
               },
             },
           }
-        } else if (event.type === "deregistered") {
-          yield {
-            event: {
-              $case: "unitDeregistration",
-              value: {
-                instanceId: event.instanceId,
+        }
+        const registrationStream = await services.pubsubManager.subscribe([
+          "worker-unit-registration",
+          projectId,
+          workerVersionId,
+        ])
+        for await (const event of registrationStream) {
+          if (event.type === "registered") {
+            yield {
+              event: {
+                $case: "unitRegistration",
+                value: { stateId: event.stateId, params: event.params },
               },
-            },
+            }
+          } else if (event.type === "deregistered") {
+            yield {
+              event: {
+                $case: "unitDeregistration",
+                value: { stateId: event.stateId },
+              },
+            }
           }
         }
+      } finally {
+        services.panelEndpointManager.disconnect(workerInstanceId)
       }
     },
 

package/src/index.ts

@@ -1,10 +1,12 @@
 import type { Services } from "@highstate/backend"
 import { rm } from "node:fs/promises"
 import { InstanceServiceDefinition } from "@highstate/api/instance.v1"
+import { PanelServiceDefinition } from "@highstate/api/panel.v1"
 import { SecretServiceDefinition } from "@highstate/api/secret.v1"
 import { WorkerServiceDefinition } from "@highstate/api/worker.v1"
 import { createServer } from "nice-grpc"
 import { createInstanceService } from "./handlers/instance"
+import { createPanelService } from "./handlers/panel"
 import { createSecretService } from "./handlers/secret"
 import { createWorkerService } from "./handlers/worker"
 import { createErrorHandlingMiddleware } from "./shared"
@@ -14,6 +16,7 @@ export async function startBackedApi(services: Services) {
   server.use(createErrorHandlingMiddleware(services))
 
   server.add(InstanceServiceDefinition, createInstanceService(services))
+  server.add(PanelServiceDefinition, createPanelService(services))
   server.add(SecretServiceDefinition, createSecretService(services))
   server.add(WorkerServiceDefinition, createWorkerService(services))
 
@@ -29,7 +32,6 @@ export async function startBackedApi(services: Services) {
   }
 
   await server.listen(`unix:${sockPath}`)
-
   services.workerManager.config.HIGHSTATE_WORKER_API_PATH = sockPath
   services.logger.info(`api listening at %s`, sockPath)
 }