anbaric-impl-cloud 1.20.1 → 1.21.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anbaric-impl-cloud",
-  "version": "1.20.1",
+  "version": "1.21.1",
   "description": "Public client library for the Anbaric Cloud hosting API, providing JobPersistence and Queue implementations backed by the cloud service",
   "license": "MIT",
   "author": "chris@anbaric.ai",
@@ -11,7 +11,7 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "anbaric-tsapi": "^1.20.1"
+    "anbaric-tsapi": "^1.21.1"
   },
   "devDependencies": {
     "@types/node": "^26.2.0",

package/src/CloudApiClient.ts

@@ -1,5 +1,6 @@
 const DEFAULT_BASE_URL = "http://localhost:8787";
 const API_PREFIX = "/api/v2";
+const APP_HEADER = "x-anbaric-app";
 
 class CloudApiClient {
 
@@ -10,9 +11,17 @@ class CloudApiClient {
     }
 
     async request(method : string, path : string, body? : unknown) : Promise<any> {
+        // Every request carries the calling app's id as an ambient header, so
+        // the platform can scope app-owned resources (documents, secrets) to it
+        // without the app id appearing in any URL.
+        const headers : Record<string, string> = {};
+        const appId = process.env.ANBARIC_APP_ID;
+        if (appId) headers[APP_HEADER] = appId;
+        if (body !== undefined) headers["content-type"] = "application/json";
+
         const response = await fetch(`${this.baseUrl}${API_PREFIX}${path}`, {
             method,
-            headers: body === undefined ? undefined : { "content-type": "application/json" },
+            headers,
             body: body === undefined ? undefined : JSON.stringify(body),
         });
 

package/src/CloudAuditor.ts

@@ -9,9 +9,10 @@ class CloudAuditor implements Auditor {
         this.client = new CloudApiClient(baseUrl);
     }
 
-    async audit(resourceType : string, resourceId : string, actor : Actor, interaction : Array<string>,
-                description : string, details : any) : Promise<void> {
+    async audit(appId : string | undefined, resourceType : string, resourceId : string, actor : Actor,
+                interaction : Array<string>, description : string, details : any) : Promise<void> {
         await this.client.request("POST", "/audits", {
+            appId: appId || undefined,
             resourceType,
             resourceId,
             actorId: actor.id,

package/src/CloudJobPersistence.ts

@@ -1,7 +1,7 @@
-import {Auditor, Job, JobPersistence, NoOpAuditor, SerializedJob, deserializeJob, serializeJob} from "anbaric-tsapi";
+import {AppAware, Auditor, currentAppId, Job, JobPersistence, NoOpAuditor, SerializedJob, deserializeJob, serializeJob} from "anbaric-tsapi";
 import {CloudApiClient} from "./CloudApiClient";
 
-class CloudJobPersistence extends JobPersistence {
+class CloudJobPersistence extends JobPersistence implements AppAware {
 
     private client : CloudApiClient;
 
@@ -10,6 +10,10 @@ class CloudJobPersistence extends JobPersistence {
         this.client = new CloudApiClient(baseUrl);
     }
 
+    getAppId() : string {
+        return currentAppId();
+    }
+
     protected async saveInternal(job : Job) : Promise<void> {
         await this.client.request("PUT", `/jobs/${encodeURIComponent(job.id)}`, serializeJob(job));
     }

package/src/CloudJsonStore.ts

@@ -1,7 +1,7 @@
-import {Auditor, JsonSchema, JsonStore, NoOpAuditor, validateDocument} from "anbaric-tsapi";
+import {AppAware, Auditor, currentAppId, JsonSchema, JsonStore, NoOpAuditor, validateDocument} from "anbaric-tsapi";
 import {CloudApiClient} from "./CloudApiClient";
 
-class CloudJsonStore extends JsonStore {
+class CloudJsonStore extends JsonStore implements AppAware {
 
     private client : CloudApiClient;
     private schema? : JsonSchema;
@@ -13,6 +13,10 @@ class CloudJsonStore extends JsonStore {
         this.client = new CloudApiClient(baseUrl);
     }
 
+    getAppId() : string {
+        return currentAppId();
+    }
+
     protected async saveInternal(id : string, document : any) : Promise<void> {
         if (this.schema) {
             const violations = validateDocument(document, this.schema);

package/src/CloudQueue.ts

@@ -9,12 +9,12 @@ class CloudQueue implements Queue {
         this.client = new CloudApiClient(baseUrl);
     }
 
-    async enqueue(jobId : string, workflowId : string) : Promise<void> {
-        await this.client.request("POST", "/queue/enqueue", { jobId, workflowId });
+    async enqueue(jobId : string, appId : string | undefined, workflowId : string) : Promise<void> {
+        await this.client.request("POST", "/queue/enqueue", { jobId, appId, workflowId });
     }
 
-    async schedule(jobId : string, workflowId : string, due : Date) : Promise<void> {
-        await this.client.request("POST", "/queue/schedule", { jobId, workflowId, due: due.toISOString() });
+    async schedule(jobId : string, appId : string | undefined, workflowId : string, due : Date) : Promise<void> {
+        await this.client.request("POST", "/queue/schedule", { jobId, appId, workflowId, due: due.toISOString() });
     }
 
 }

package/src/CloudSecretStore.ts

@@ -1,7 +1,7 @@
-import {Auditor, NoOpAuditor, SecretStore} from "anbaric-tsapi";
+import {AppAware, Auditor, currentAppId, NoOpAuditor, SecretStore} from "anbaric-tsapi";
 import {CloudApiClient} from "./CloudApiClient";
 
-class CloudSecretStore extends SecretStore {
+class CloudSecretStore extends SecretStore implements AppAware {
 
     private client : CloudApiClient;
 
@@ -10,6 +10,10 @@ class CloudSecretStore extends SecretStore {
         this.client = new CloudApiClient(baseUrl);
     }
 
+    getAppId() : string {
+        return currentAppId();
+    }
+
     protected async saveInternal(name : string, value : string) : Promise<void> {
         await this.client.request("PUT", this.secretPath(name), { value });
     }

package/src/PushConsumer.ts

@@ -37,17 +37,23 @@ class PushConsumer implements Consumer {
         return this.boundPort;
     }
 
-    subscribe(workflowId : string, processJob : ProcessJob) : void {
-        this.subscribers.set(workflowId, processJob);
+    // Subscribers are keyed by the (appId, workflowId) composite, encoded as a
+    // tuple so an app and a machine id can never collide.
+    private key(appId : string | undefined, workflowId : string) : string {
+        return JSON.stringify([appId || null, workflowId]);
+    }
+
+    subscribe(appId : string | undefined, workflowId : string, processJob : ProcessJob) : void {
+        this.subscribers.set(this.key(appId, workflowId), processJob);
         if (!this.server) this.listening = this.listen();
-        void this.register(workflowId);
+        void this.register(appId, workflowId);
     }
 
-    private async register(workflowId : string) : Promise<void> {
+    private async register(appId : string | undefined, workflowId : string) : Promise<void> {
         try {
             await this.listening;
             const url = process.env.ANBARIC_CONSUMER_URL ?? `http://localhost:${this.boundPort}`;
-            await this.client.request("POST", "/consumers", { workflowId, url });
+            await this.client.request("POST", "/consumers", { appId, workflowId, url });
         } catch {
         }
     }
@@ -94,7 +100,7 @@ class PushConsumer implements Consumer {
 
     private async processAll(messages : Array<QueueMessage>) : Promise<void> {
         for (const message of messages) {
-            const processJob = this.subscribers.get(message.workflowId);
+            const processJob = this.subscribers.get(this.key(message.appId, message.workflowId));
             if (!processJob) continue;
             try {
                 await processJob(message.jobId);