@jumoo/processing 18.2.0 → 19.0.0-beta01

package/dist/pipeline/pipeline.source.d.ts

@@ -3,6 +3,10 @@ import { PipelineStatus } from '../api';
 export declare class PipelineSource {
     private readonly host;
     constructor(host: UmbControllerHost);
+    /**
+     * @description a 409 (another pipeline holds this one's concurrency key, so it can't resume)
+     * is returned as the error without a notification - see getPipelineConflict.
+     */
     process(id: string, clientId: string | null): Promise<import("@umbraco-cms/backoffice/resources").UmbApiResponse<({
         data: import("..").Pipeline;
         error: undefined;
@@ -29,6 +33,10 @@ export declare class PipelineSource {
         request?: Request;
         response?: Response;
     }>>;
+    /**
+     * @description a 409 (the new options' concurrency key is held) is returned as the error
+     * without a notification - see getPipelineConflict.
+     */
     update(id: string, body: any): Promise<import("@umbraco-cms/backoffice/resources").UmbApiResponse<({
         data: import("..").ProcessingOptionsResults;
         error: undefined;
@@ -67,7 +75,8 @@ export declare class PipelineSource {
     /**
      *
      * @param strategy alias of the strategy to use for the pipeline
-     * @returns
+     * @returns the new pipeline's id. A 409 (another pipeline holds its concurrency key) is
+     * returned as the error without a notification - see getPipelineConflict.
      */
     create(processor: string, strategy: string, options: any): Promise<import("@umbraco-cms/backoffice/resources").UmbApiResponse<({
         data: string;
@@ -108,6 +117,20 @@ export declare class PipelineSource {
         request?: Request;
         response?: Response;
     }>>;
+    /**
+     * @param id guid id of the pipeline
+     * @returns its run status, or an error (without a notification) if the user can't see it.
+     */
+    getRunStatus(id: string): Promise<import("@umbraco-cms/backoffice/resources").UmbApiResponse<({
+        data: import("..").PipelineRunStatus;
+        error: undefined;
+    } | {
+        data: undefined;
+        error: unknown;
+    }) & {
+        request?: Request;
+        response?: Response;
+    }>>;
     listPiplelines(status: PipelineStatus): Promise<import("@umbraco-cms/backoffice/resources").UmbApiResponse<({
         data: import("..").Pipeline[];
         error: undefined;

package/dist/pipeline/pipeline.source.js

@@ -1,11 +1,16 @@
 import { tryExecute } from '@umbraco-cms/backoffice/resources';
-import { getProcessingGetPipelineById, getProcessingGetProcessors, getProcessingGetResultsById, getProcessingListPipelinesByStatus, postProcessingClearPipelineById, postProcessingCreatePipeline, postProcessingProcessPipelineById, postProcessingReattachPipelineById, postProcessingUpdatePipelineById, } from '../api';
+import { getProcessingGetPipelineById, getProcessingGetProcessors, getProcessingGetResultsById, getProcessingListPipelinesByStatus, getProcessingPipelineStatusById, postProcessingClearPipelineById, postProcessingCreatePipeline, postProcessingProcessPipelineById, postProcessingReattachPipelineById, postProcessingUpdatePipelineById, } from '../api';
+import { tryExecuteAllowingConflict } from './pipeline-conflict.js';
 export class PipelineSource {
     constructor(host) {
         this.host = host;
     }
+    /**
+     * @description a 409 (another pipeline holds this one's concurrency key, so it can't resume)
+     * is returned as the error without a notification - see getPipelineConflict.
+     */
     async process(id, clientId) {
-        const result = await tryExecute(this.host, postProcessingProcessPipelineById({
+        const result = await tryExecuteAllowingConflict(this.host, postProcessingProcessPipelineById({
             path: { id: id },
             query: { clientId: clientId ?? undefined },
         }));
@@ -24,8 +29,12 @@ export class PipelineSource {
         }));
         return result;
     }
+    /**
+     * @description a 409 (the new options' concurrency key is held) is returned as the error
+     * without a notification - see getPipelineConflict.
+     */
     async update(id, body) {
-        return await tryExecute(this.host, postProcessingUpdatePipelineById({
+        return await tryExecuteAllowingConflict(this.host, postProcessingUpdatePipelineById({
             path: { id: id },
             body: body,
         }));
@@ -44,10 +53,11 @@ export class PipelineSource {
     /**
      *
      * @param strategy alias of the strategy to use for the pipeline
-     * @returns
+     * @returns the new pipeline's id. A 409 (another pipeline holds its concurrency key) is
+     * returned as the error without a notification - see getPipelineConflict.
      */
     async create(processor, strategy, options) {
-        return await tryExecute(this.host, postProcessingCreatePipeline({
+        return await tryExecuteAllowingConflict(this.host, postProcessingCreatePipeline({
             body: {
                 alias: processor,
                 strategy: strategy,
@@ -73,6 +83,15 @@ export class PipelineSource {
             path: { id: id },
         }));
     }
+    /**
+     * @param id guid id of the pipeline
+     * @returns its run status, or an error (without a notification) if the user can't see it.
+     */
+    async getRunStatus(id) {
+        return await tryExecute(this.host, getProcessingPipelineStatusById({ path: { id: id } }), {
+            disableNotifications: true,
+        });
+    }
     async listPiplelines(status) {
         return await tryExecute(this.host, getProcessingListPipelinesByStatus({ path: { status: status } }));
     }

package/dist/signalr/signalr.context.d.ts

@@ -9,6 +9,15 @@ export declare class ProcessingSignalRContext extends UmbControllerBase {
     readonly message: import("rxjs").Observable<ProcessingHubMessage[]>;
     readonly clientId: import("rxjs").Observable<string | null>;
     readonly connectionState: import("rxjs").Observable<ProcessingConnectionState>;
+    /**
+     * @description connects to the processing hub. From Umbraco 19 the backoffice session is a
+     * cookie, so the connection sends that rather than a token.
+     */
+    startHub(methods: string[]): void;
+    /**
+     * @deprecated there is no client-side token from Umbraco 19 - call `startHub(methods)`. The
+     * token is ignored. Will be removed in v21.
+     */
     startHub(token: string, methods: string[]): void;
     hostConnected(): void;
     hostDisconnected(): void;

package/dist/signalr/signalr.context.js

@@ -28,8 +28,9 @@ export class ProcessingSignalRContext extends UmbControllerBase {
         this.connectionState = __classPrivateFieldGet(this, _ProcessingSignalRContext_connectionState, "f").asObservable();
         this.provideContext(JUMOO_PROCESSING_SIGNALR_CONTEXT, this);
     }
-    startHub(token, methods) {
-        __classPrivateFieldGet(this, _ProcessingSignalRContext_instances, "m", _ProcessingSignalRContext_setupConnection).call(this, JUMOO_PROCESSING_HUB_PATH, token, methods);
+    startHub(tokenOrMethods, methods) {
+        const hubMethods = Array.isArray(tokenOrMethods) ? tokenOrMethods : (methods ?? []);
+        __classPrivateFieldGet(this, _ProcessingSignalRContext_instances, "m", _ProcessingSignalRContext_setupConnection).call(this, JUMOO_PROCESSING_HUB_PATH, hubMethods);
     }
     hostConnected() {
         super.hostConnected();
@@ -53,9 +54,11 @@ export class ProcessingSignalRContext extends UmbControllerBase {
         return __classPrivateFieldGet(this, _ProcessingSignalRContext_connection, "f")?.connectionId ?? null;
     }
 }
-_ProcessingSignalRContext_connection = new WeakMap(), _ProcessingSignalRContext_messages = new WeakMap(), _ProcessingSignalRContext_clientId = new WeakMap(), _ProcessingSignalRContext_connectionState = new WeakMap(), _ProcessingSignalRContext_instances = new WeakSet(), _ProcessingSignalRContext_setupConnection = function _ProcessingSignalRContext_setupConnection(url, token, methods) {
+_ProcessingSignalRContext_connection = new WeakMap(), _ProcessingSignalRContext_messages = new WeakMap(), _ProcessingSignalRContext_clientId = new WeakMap(), _ProcessingSignalRContext_connectionState = new WeakMap(), _ProcessingSignalRContext_instances = new WeakSet(), _ProcessingSignalRContext_setupConnection = function _ProcessingSignalRContext_setupConnection(url, methods) {
+    // no accessTokenFactory: the backoffice auth cookie goes with the negotiate request and
+    // the websocket upgrade, which is how Umbraco's own server-event hub connects.
     __classPrivateFieldSet(this, _ProcessingSignalRContext_connection, new signalR.HubConnectionBuilder()
-        .withUrl(url, { accessTokenFactory: () => token })
+        .withUrl(url)
         .withAutomaticReconnect([0, 2000, 10000, 30000])
         .configureLogging(signalR.LogLevel.None)
         .build(), "f");

package/package.json

@@ -1,52 +1,59 @@
-{
-	"name": "@jumoo/processing",
-	"licence": "custom",
-	"version": "18.2.0",
-	"type": "module",
-	"description": "Jumoo processing library",
-	"exports": {
-		".": "./dist/index.js",
-		"./pipeline": "./dist/pipeline/index.js",
-		"./signalr": "./dist/signalr/index.js",
-		"./api": "./dist/api/index.js"
-	},
-	"files": [
-		"./dist/**/*"
-	],
-	"author": {
-		"name": "Jumoo",
-		"email": "info@jumoo.co.uk",
-		"url": "https://jumoo.co.uk"
-	},
-	"publishConfig": {},
-	"scripts": {
-		"client:build": "tsc --project ./tsconfig.dist.json",
-		"client:pack": "npm pack --pack-destination ./pack",
-		"client:publish": "npm publish -tag next",
-		"client:make": "npm run client:build && npm run client:pack && npm run client:publish",
-		"client:link": "npm link",
-		"generate-client": "node scripts/generate-openapi.js https://localhost:44348/umbraco/openapi/processing.json",
-		"lint": "eslint .",
-		"lint:fix": "eslint . --fix",
-		"format:fix": "npm run format -- --write",
-		"format": "prettier \"src/**/*.ts\" \"*.ts\" \"*.js\" \"*.json\" \"scripts/**/*.js\" --check",
-		"build": "tsc && vite build",
-		"watch": "vite build --watch",
-		"make": "npm run build && npm run client:make"
-	},
-	"devDependencies": {
-		"@eslint/js": "^10.0.1",
-		"@hey-api/openapi-ts": "^0.99.0",
-		"@microsoft/signalr": "^10.0.0",
-		"@umbraco-cms/backoffice": "18.0.1",
-		"chalk": "^5.6.2",
-		"cross-env": "^10.1.0",
-		"eslint": "^10.5.0",
-		"globals": "^17.8.0",
-		"node-fetch": "^3.3.2",
-		"prettier": "^3.8.2",
-		"typescript": "^6.0.3",
-		"typescript-eslint": "^8.65.0",
-		"vite": "^8.0.16"
-	}
-}
+{
+	"name": "@jumoo/processing",
+	"licence": "custom",
+	"version": "19.0.0-beta01",
+	"type": "module",
+	"description": "Jumoo processing library",
+	"exports": {
+		".": "./dist/index.js",
+		"./pipeline": "./dist/pipeline/index.js",
+		"./signalr": "./dist/signalr/index.js",
+		"./api": "./dist/api/index.js"
+	},
+	"files": [
+		"./dist/**/*"
+	],
+	"author": {
+		"name": "Jumoo",
+		"email": "info@jumoo.co.uk",
+		"url": "https://jumoo.co.uk"
+	},
+	"publishConfig": {
+		"access": "public"
+	},
+	"scripts": {
+		"client:build": "tsc --project ./tsconfig.dist.json",
+		"client:pack": "npm pack --pack-destination ./pack",
+		"client:publish": "npm publish -tag next",
+		"client:make": "npm run client:build && npm run client:pack && npm run client:publish",
+		"client:link": "npm link",
+		"generate-client": "node scripts/generate-openapi.js https://localhost:44348/umbraco/openapi/processing.json",
+		"lint": "eslint .",
+		"lint:fix": "eslint . --fix",
+		"format:fix": "npm run format -- --write",
+		"format": "prettier \"src/**/*.ts\" \"*.ts\" \"*.js\" \"*.json\" \"scripts/**/*.js\" --check",
+		"build": "tsc && vite build",
+		"watch": "vite build --watch",
+		"make": "npm run build && npm run client:make"
+	},
+	"devDependencies": {
+		"@eslint/js": "^10.0.1",
+		"@hey-api/openapi-ts": "^0.99.0",
+		"@microsoft/signalr": "^10.0.0",
+		"@umbraco-cms/backoffice": "19.0.0-beta1",
+		"chalk": "^5.6.2",
+		"cross-env": "^10.1.0",
+		"eslint": "^10.13.0",
+		"globals": "^17.13.0",
+		"node-fetch": "^3.3.2",
+		"prettier": "^3.9.10",
+		"typescript": "^6.0.3",
+		"typescript-eslint": "^8.71.2",
+		"vite": "^8.3.4"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/Jumoo/Jumoo.Processing.git",
+		"directory": "Jumoo.Processing.Client/jumoo-processing-assets"
+	}
+}

package/dist/hey-api.d.ts

@@ -1,11 +0,0 @@
-import type { CreateClientConfig } from './api/client.gen';
-/**
- * Pre-configure the generated client by copying the Umbraco HTTP client's config.
- *
- * Called automatically by the generated client during initialization (via runtimeConfigPath).
- * Inherits baseUrl, credentials, auth, and headers from umbHttpClient — which is already
- * configured by the backoffice before extensions load.
- *
- * @see https://heyapi.dev/openapi-ts/clients/fetch#configuration
- */
-export declare const createClientConfig: CreateClientConfig;

package/dist/hey-api.js

@@ -1,14 +0,0 @@
-import { umbHttpClient } from '@umbraco-cms/backoffice/http-client';
-/**
- * Pre-configure the generated client by copying the Umbraco HTTP client's config.
- *
- * Called automatically by the generated client during initialization (via runtimeConfigPath).
- * Inherits baseUrl, credentials, auth, and headers from umbHttpClient — which is already
- * configured by the backoffice before extensions load.
- *
- * @see https://heyapi.dev/openapi-ts/clients/fetch#configuration
- */
-export const createClientConfig = (config) => ({
-    ...config,
-    ...umbHttpClient.getConfig(),
-});