@jumoo/processing 18.3.0 → 19.0.0-beta01

package/dist/pipeline/modal/errors/error-modal.element.js

@@ -39,7 +39,9 @@ let JumooProcessingErrorModal = class JumooProcessingErrorModal extends UmbModal
 						<div class="detail">${this.data?.error.action}</div>
 					</div>
 					<div class="more">
-						<div class="label"></div>
+						<div class="label">
+							<umb-localize key="jumooProcError_step"></umb-localize>
+						</div>
 						<div class="detail">
 							${this.data?.error.step}
 							${when(this.data?.error.subStep, () => html `(${this.data?.error.subStep})`)}

package/dist/pipeline/pipeline.context.js

@@ -9,10 +9,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _PipelineContext_instances, _PipelineContext_repository, _PipelineContext_hubContext, _PipelineContext_pipeline, _PipelineContext_state, _PipelineContext_options, _PipelineContext_results, _PipelineContext_message, _PipelineContext_backgroundState, _PipelineContext_conflict, _PipelineContext_clientId, _PipelineContext_hasConnectedBefore, _PipelineContext_onClientIdChanged, _PipelineContext_isInFlight, _PipelineContext_setConflict, _PipelineContext_trigger, _PipelineContext_close, _PipelineContext_finalized, _PipelineContext_valid, _PipelineContext_pending;
+var _PipelineContext_instances, _PipelineContext_repository, _PipelineContext_hubContext, _PipelineContext_pipeline, _PipelineContext_state, _PipelineContext_options, _PipelineContext_results, _PipelineContext_message, _PipelineContext_backgroundState, _PipelineContext_conflict, _PipelineContext_clientId, _PipelineContext_hasConnectedBefore, _PipelineContext_onClientIdChanged, _PipelineContext_isInFlight, _PipelineContext_setConflict, _PipelineContext_retryAfterSignIn, _PipelineContext_waitForSignIn, _PipelineContext_trigger, _PipelineContext_close, _PipelineContext_finalized, _PipelineContext_valid, _PipelineContext_pending;
 import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import { UmbBooleanState, UmbObjectState } from '@umbraco-cms/backoffice/observable-api';
+import { UMB_AUTH_CONTEXT } from '@umbraco-cms/backoffice/auth';
+import { UmbApiError } from '@umbraco-cms/backoffice/resources';
+import { filter, firstValueFrom } from '@umbraco-cms/backoffice/external/rxjs';
 import { PipelineStatus, PipelineRepository, ProcessingSignalRContext, getPipelineConflict, } from '@jumoo/processing';
 /**
  * @description context for keeping pipeline status and progress as we do things.
@@ -65,8 +68,7 @@ export class PipelineContext extends UmbControllerBase {
         __classPrivateFieldSet(this, _PipelineContext_repository, new PipelineRepository(this), "f");
         this.provideContext(JUMOO_PROCESSING_CONTEXT, this);
         __classPrivateFieldSet(this, _PipelineContext_hubContext, new ProcessingSignalRContext(this), "f");
-        const token = '[redacted]';
-        __classPrivateFieldGet(this, _PipelineContext_hubContext, "f").startHub(token, ['message', 'state']);
+        __classPrivateFieldGet(this, _PipelineContext_hubContext, "f").startHub(['message', 'state']);
         this.observe(__classPrivateFieldGet(this, _PipelineContext_hubContext, "f").messagesOf('message'), (message) => {
             if (!message?.message)
                 return;
@@ -93,7 +95,7 @@ export class PipelineContext extends UmbControllerBase {
     }
     async createPipeline(processor, strategy, options) {
         __classPrivateFieldGet(this, _PipelineContext_conflict, "f").setValue(undefined);
-        const { data, error } = await __classPrivateFieldGet(this, _PipelineContext_repository, "f").tryCreate(processor, strategy, options);
+        const { data, error } = await __classPrivateFieldGet(this, _PipelineContext_instances, "m", _PipelineContext_retryAfterSignIn).call(this, () => __classPrivateFieldGet(this, _PipelineContext_repository, "f").tryCreate(processor, strategy, options));
         if (error) {
             await __classPrivateFieldGet(this, _PipelineContext_instances, "m", _PipelineContext_setConflict).call(this, error);
             return;
@@ -123,8 +125,10 @@ export class PipelineContext extends UmbControllerBase {
     async process() {
         if (!__classPrivateFieldGet(this, _PipelineContext_pipeline, "f").value)
             return;
-        const clientId = __classPrivateFieldGet(this, _PipelineContext_hubContext, "f")?.getClientId() ?? null;
-        const { data: response, error } = await __classPrivateFieldGet(this, _PipelineContext_repository, "f").tryProcess(__classPrivateFieldGet(this, _PipelineContext_pipeline, "f").value, clientId);
+        const pipelineId = __classPrivateFieldGet(this, _PipelineContext_pipeline, "f").value;
+        const { data: response, error } = await __classPrivateFieldGet(this, _PipelineContext_instances, "m", _PipelineContext_retryAfterSignIn).call(this, () => 
+        // the connection id is read each time: the hub can reconnect while the user signs in.
+        __classPrivateFieldGet(this, _PipelineContext_repository, "f").tryProcess(pipelineId, __classPrivateFieldGet(this, _PipelineContext_hubContext, "f")?.getClientId() ?? null));
         if (error) {
             await __classPrivateFieldGet(this, _PipelineContext_instances, "m", _PipelineContext_setConflict).call(this, error);
             return undefined;
@@ -143,7 +147,8 @@ export class PipelineContext extends UmbControllerBase {
     async updateOptions(options) {
         if (!__classPrivateFieldGet(this, _PipelineContext_pipeline, "f").value)
             return;
-        const { data: response, error } = await __classPrivateFieldGet(this, _PipelineContext_repository, "f").tryUpdate(__classPrivateFieldGet(this, _PipelineContext_pipeline, "f").value, options);
+        const pipelineId = __classPrivateFieldGet(this, _PipelineContext_pipeline, "f").value;
+        const { data: response, error } = await __classPrivateFieldGet(this, _PipelineContext_instances, "m", _PipelineContext_retryAfterSignIn).call(this, () => __classPrivateFieldGet(this, _PipelineContext_repository, "f").tryUpdate(pipelineId, options));
         if (error)
             await __classPrivateFieldGet(this, _PipelineContext_instances, "m", _PipelineContext_setConflict).call(this, error);
         if (response?.options) {
@@ -157,7 +162,8 @@ export class PipelineContext extends UmbControllerBase {
     async saveOptions() {
         if (!__classPrivateFieldGet(this, _PipelineContext_pipeline, "f").value)
             return;
-        const { data: response, error } = await __classPrivateFieldGet(this, _PipelineContext_repository, "f").tryUpdate(__classPrivateFieldGet(this, _PipelineContext_pipeline, "f").value, __classPrivateFieldGet(this, _PipelineContext_options, "f").value);
+        const pipelineId = __classPrivateFieldGet(this, _PipelineContext_pipeline, "f").value;
+        const { data: response, error } = await __classPrivateFieldGet(this, _PipelineContext_instances, "m", _PipelineContext_retryAfterSignIn).call(this, () => __classPrivateFieldGet(this, _PipelineContext_repository, "f").tryUpdate(pipelineId, __classPrivateFieldGet(this, _PipelineContext_options, "f").value));
         if (error)
             await __classPrivateFieldGet(this, _PipelineContext_instances, "m", _PipelineContext_setConflict).call(this, error);
         if (response?.options) {
@@ -290,6 +296,48 @@ async function _PipelineContext_setConflict(error) {
     if (holder)
         __classPrivateFieldGet(this, _PipelineContext_conflict, "f").setValue({ ...conflict, holder });
     return true;
+}, _PipelineContext_retryAfterSignIn = 
+/**
+ * @description makes a create, update or process call, and makes it again if it hit a session
+ * timeout. From Umbraco 19 a 401 on a POST opens the login modal but, unlike a GET, the
+ * request is not retried - so a run would drop back to waiting mid-pipeline, or carry on with
+ * options that were never saved. The 401 comes from the auth middleware, before our
+ * controller runs, so once the user has signed back in it is safe to send the same call again.
+ * @param call the request, made again on each attempt.
+ * @returns the first result that isn't a 401.
+ */
+async function _PipelineContext_retryAfterSignIn(call) {
+    let result = await call();
+    while (result.error && (await __classPrivateFieldGet(this, _PipelineContext_instances, "m", _PipelineContext_waitForSignIn).call(this, result.error))) {
+        result = await call();
+    }
+    return result;
+}, _PipelineContext_waitForSignIn = 
+/**
+ * @description waits for the user to sign back in after a session timeout.
+ * @param error the error from a request.
+ * @returns true once the user has signed back in after a 401, false for any other error.
+ */
+async function _PipelineContext_waitForSignIn(error) {
+    // the generated client doesn't throw, so this is usually the problem details themselves
+    // rather than an UmbApiError - check both, as getPipelineConflict does.
+    const status = UmbApiError.isUmbApiError(error)
+        ? error.status
+        : error?.status;
+    if (status !== 401)
+        return false;
+    const authContext = await this.getContext(UMB_AUTH_CONTEXT);
+    if (!authContext)
+        return false;
+    // the 401 clears the session, but the request can land before that does - so wait for
+    // the session to be gone and then back, rather than taking a still-signed-in value.
+    let signedOut = false;
+    await firstValueFrom(authContext.isAuthorized.pipe(filter((isAuthorized) => {
+        if (!isAuthorized)
+            signedOut = true;
+        return isAuthorized && signedOut;
+    })));
+    return true;
 };
 export default PipelineContext;
 export const JUMOO_PROCESSING_CONTEXT = new UmbContextToken('JumooPipelineContext');

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,7 +1,7 @@
 {
 	"name": "@jumoo/processing",
 	"licence": "custom",
-	"version": "18.3.0",
+	"version": "19.0.0-beta01",
 	"type": "module",
 	"description": "Jumoo processing library",
 	"exports": {
@@ -40,7 +40,7 @@
 		"@eslint/js": "^10.0.1",
 		"@hey-api/openapi-ts": "^0.99.0",
 		"@microsoft/signalr": "^10.0.0",
-		"@umbraco-cms/backoffice": "18.0.1",
+		"@umbraco-cms/backoffice": "19.0.0-beta1",
 		"chalk": "^5.6.2",
 		"cross-env": "^10.1.0",
 		"eslint": "^10.13.0",