anbaric-cloud-hosting 1.21.2 → 1.21.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anbaric-cloud-hosting",
-  "version": "1.21.2",
+  "version": "1.21.4",
   "description": "Anbaric Cloud hosting service: Postgres-backed job persistence and queuing exposed over an HTTP API",
   "license": "MIT",
   "author": "chris@anbaric.ai",
@@ -18,18 +18,18 @@
     "@aws-sdk/client-s3": "^3.1110.0",
     "@aws-sdk/client-secrets-manager": "^3.700.0",
     "@aws-sdk/client-servicediscovery": "^3.1110.0",
-    "anbaric-data-store": "^1.21.2",
-    "anbaric-plugins": "^1.21.2",
-    "anbaric-tsapi": "^1.21.2",
-    "anbaric-web": "^1.21.2",
+    "anbaric-data-store": "^1.21.4",
+    "anbaric-plugins": "^1.21.4",
+    "anbaric-tsapi": "^1.21.4",
+    "anbaric-web": "^1.21.4",
     "esbuild": "^0.28.2",
     "pg": "^8.16.0"
   },
   "devDependencies": {
     "@types/node": "^26.2.0",
     "@types/pg": "^8.15.0",
-    "anbaric-impl-cloud": "^1.21.2",
-    "anbaric-state-machine": "^1.21.2",
+    "anbaric-impl-cloud": "^1.21.4",
+    "anbaric-state-machine": "^1.21.4",
     "tsx": "^4.20.0",
     "typescript": "^7.0.2"
   },

package/src/auth/SessionSigner.ts

@@ -40,6 +40,8 @@ class SessionSigner {
             sub: user.id,
             tenant: tenant?.id,
             roles: user.roles.map(role => role.id),
+            name: user.name,
+            picture: user.picture,
             exp: nowSeconds() + this.ttlSeconds,
         };
         const payload = base64url(JSON.stringify(claims));
@@ -52,7 +54,7 @@ class SessionSigner {
         const [payload, signature] = token.split(".");
         if (!payload || !signature || !this.signatureMatches(payload, signature)) return undefined;
 
-        let claims : { sub? : unknown, tenant? : unknown, roles? : unknown, exp? : unknown };
+        let claims : { sub? : unknown, tenant? : unknown, roles? : unknown, name? : unknown, picture? : unknown, exp? : unknown };
         try {
             claims = JSON.parse(Buffer.from(payload, "base64url").toString());
         } catch {
@@ -64,7 +66,9 @@ class SessionSigner {
 
         const roles = Array.isArray(claims.roles) ? claims.roles.map(id => new Role(String(id))) : [];
         const tenant = typeof claims.tenant === "string" ? new Tenant(claims.tenant) : undefined;
-        return [new User(claims.sub, roles), tenant];
+        const name = typeof claims.name === "string" ? claims.name : undefined;
+        const picture = typeof claims.picture === "string" ? claims.picture : undefined;
+        return [new User(claims.sub, roles, [], name, picture), tenant];
     }
 
     // Sets (or, for a still-valid session, refreshes) the session cookie.

package/src/auth/User.ts

@@ -6,11 +6,16 @@ class User {
     readonly id : string;
     roles : Array<Role>;
     keyPairs : Array<KeyPair>;
+    readonly name? : string;
+    readonly picture? : string;
 
-    constructor(id : string, roles : Array<Role> = [], keyPairs : Array<KeyPair> = []) {
+    constructor(id : string, roles : Array<Role> = [], keyPairs : Array<KeyPair> = [],
+                name? : string, picture? : string) {
         this.id = id;
         this.roles = roles;
         this.keyPairs = keyPairs;
+        this.name = name;
+        this.picture = picture;
     }
 
     hasRole(role : Role) : boolean {

package/src/data-store/Schema.ts

@@ -72,6 +72,8 @@ const ensureSchema = async (pool : Pool) : Promise<void> => {
         )
     `);
     await pool.query("ALTER TABLE queue ADD COLUMN IF NOT EXISTS app_id TEXT");
+    await pool.query("ALTER TABLE queue ADD COLUMN IF NOT EXISTS retry_at TIMESTAMPTZ");
+    await pool.query("ALTER TABLE queue ADD COLUMN IF NOT EXISTS attempts INT NOT NULL DEFAULT 0");
     await pool.query(`UPDATE queue
         SET app_id = split_part(workflow_id, '/', 1),
             workflow_id = substring(workflow_id from position('/' in workflow_id) + 1)

package/src/hosting/HostingServer.ts

@@ -4,7 +4,7 @@ import {AuditRecordStore} from "../auditing/AuditRecordStore";
 import {Authenticator} from "../auth/Authenticator";
 import {CliAuthorizer} from "../auth/CliAuthorizer";
 import {TokenAuthenticator} from "../auth/TokenAuthenticator";
-import {ConfirmableQueue} from "../queuing/ConfirmableQueue";
+import {RemoteQueue} from "../queuing/RemoteQueue";
 import {ConsumerRegistry} from "../queuing/ConsumerRegistry";
 import {AppProxyHandler} from "./handlers/AppProxyHandler";
 import {AppLinkFallbackHandler} from "./handlers/AppLinkFallbackHandler";
@@ -42,7 +42,7 @@ class HostingServer {
     private publicServer : Server;
     private internalServer : Server;
 
-    constructor(persistence : JobPersistence, queue : ConfirmableQueue,
+    constructor(persistence : JobPersistence, queue : RemoteQueue,
                 registry : ConsumerRegistry = new ConsumerRegistry(),
                 buildLayer? : BuildLayer,
                 documentStoreFor? : (appId : string, collection : string) => JsonStore,

package/src/hosting/handlers/QueueHandler.ts

@@ -1,10 +1,10 @@
-import {ConfirmableQueue} from "../../queuing/ConfirmableQueue";
+import {RemoteQueue} from "../../queuing/RemoteQueue";
 import {Request} from "../Request";
 import {RequestHandler} from "../RequestHandler";
 
 class QueueHandler implements RequestHandler {
 
-    constructor(private queue : ConfirmableQueue) {}
+    constructor(private queue : RemoteQueue) {}
 
     async handle(request : Request) : Promise<void> {
         if (request.subresource) return request.notFound();

package/src/hosting/handlers/auth/WhoamiHandler.ts

@@ -8,6 +8,8 @@ class WhoamiHandler implements RequestHandler {
             return request.reply(200, {
                 id: request.user.id,
                 roles: request.user.roles.map(role => role.id),
+                name: request.user.name,
+                picture: request.user.picture,
             });
         }
         request.notFound();