@jumoo/usync 17.5.2-prerelease.15 → 17.5.2

package/dist/lang/files/nl-nl.d.ts

@@ -24,43 +24,6 @@ declare const _default: {
         showAll: string;
         detailHeadline: string;
         detailHeader: string;
-        detailPosition: string;
-        previewTab: string;
-        changesTab: string;
-        previewCurrent: string;
-        previewIncoming: string;
-        previewNotInSite: string;
-        previewDeleted: string;
-        previewFailed: string;
-        previewEditor: string;
-        previewEditorDesc: string;
-        previewConfiguration: string;
-        previewNoConfiguration: string;
-        previewPropertyEditor: string;
-        previewPropertyEditorUi: string;
-        previewDocumentType: string;
-        previewMediaType: string;
-        previewMemberType: string;
-        previewElementType: string;
-        previewAllowedAtRoot: string;
-        previewVariesByCulture: string;
-        previewVariesBySegment: string;
-        previewCompositions: string;
-        previewGenericTab: string;
-        previewNoProperties: string;
-        previewMissingDataType: string;
-        previewNewDataType: string;
-        previewNew: string;
-        previewParent: string;
-        previewRoot: string;
-        previewSortOrder: string;
-        previewTemplate: string;
-        previewPublished: string;
-        previewNotPublished: string;
-        previewTrashed: string;
-        previewCulture: string;
-        previewOnlyChanges: string;
-        previewNoValueChanges: string;
         runningInBackground: string;
         connectionLost: string;
         importSingle: string;

package/dist/lang/files/nl-nl.js

@@ -24,43 +24,6 @@ export default {
         showAll: 'Alle items weergeven',
         detailHeadline: 'Gedetecteerde wijzigingen',
         detailHeader: 'Wat er anders is',
-        detailPosition: '%0% van %1%',
-        previewTab: 'Visueel',
-        changesTab: 'Wijzigingen',
-        previewCurrent: 'Huidig (deze site)',
-        previewIncoming: 'Inkomend (uSync-bestanden)',
-        previewNotInSite: 'Dit item bestaat nog niet op de site',
-        previewDeleted: 'Dit item wordt door de import verwijderd of hernoemd',
-        previewFailed: 'Het inkomende item kon niet worden opgebouwd voor het voorbeeld',
-        previewEditor: 'Editor-voorbeeld',
-        previewEditorDesc: 'Zo ziet dit datatype eruit voor redacteuren',
-        previewConfiguration: 'Configuratie',
-        previewNoConfiguration: 'Geen configuratie',
-        previewPropertyEditor: 'Property editor',
-        previewPropertyEditorUi: 'Property editor UI',
-        previewDocumentType: 'Documenttype',
-        previewMediaType: 'Mediatype',
-        previewMemberType: 'Ledentype',
-        previewElementType: 'Elementtype',
-        previewAllowedAtRoot: 'Toegestaan in de root',
-        previewVariesByCulture: 'Varieert per cultuur',
-        previewVariesBySegment: 'Varieert per segment',
-        previewCompositions: 'Composities',
-        previewGenericTab: 'Algemeen',
-        previewNoProperties: 'Geen eigenschappen',
-        previewMissingDataType: 'het datatype voor deze eigenschap bestaat nog niet op de site',
-        previewNewDataType: 'nieuw datatype',
-        previewNew: 'nieuw',
-        previewParent: 'Bovenliggend',
-        previewRoot: '(root)',
-        previewSortOrder: 'Sorteervolgorde',
-        previewTemplate: 'Sjabloon',
-        previewPublished: 'Gepubliceerd',
-        previewNotPublished: 'Niet gepubliceerd',
-        previewTrashed: 'In de prullenbak',
-        previewCulture: 'Taal',
-        previewOnlyChanges: 'Alleen wijzigingen tonen',
-        previewNoValueChanges: 'Geen waarden veranderen',
         runningInBackground: 'uSync voert dit proces op de achtergrond uit. Als u van deze pagina navigeert, blijft het doorlopen.',
         connectionLost: 'De verbinding met de server is verbroken. Het proces blijft op de achtergrond draaien, maar u ziet hier geen updates.',
         importSingle: 'Importeren',

package/dist/repository/SyncAction.respositoy.d.ts

@@ -98,12 +98,4 @@ export declare class uSyncActionRepository extends UmbControllerBase {
         request: Request;
         response: Response;
     }>>;
-    /**
-     * gets the current and incoming versions of an item, when its handler supports previews.
-     */
-    getPreview(handler: string, key: string): Promise<import("@umbraco-cms/backoffice/resources").UmbApiResponse<{
-        data: import("@jumoo/uSync").SyncItemPreviewResponse;
-        request: Request;
-        response: Response;
-    }>>;
 }

package/dist/repository/SyncAction.respositoy.js

@@ -121,11 +121,5 @@ export class uSyncActionRepository extends UmbControllerBase {
     async getSyncFileInfo() {
         return await __classPrivateFieldGet(this, _uSyncActionRepository_actionDataSource, "f").getSyncFileInfo();
     }
-    /**
-     * gets the current and incoming versions of an item, when its handler supports previews.
-     */
-    async getPreview(handler, key) {
-        return await __classPrivateFieldGet(this, _uSyncActionRepository_actionDataSource, "f").getPreview(handler, key);
-    }
 }
 _uSyncActionRepository_actionDataSource = new WeakMap(), _uSyncActionRepository_settingsDataSource = new WeakMap(), _uSyncActionRepository_migrartionDataSource = new WeakMap();

package/dist/repository/sources/SyncAction.source.d.ts

@@ -34,9 +34,4 @@ export declare class uSyncActionDataSource implements SyncActionDataSource {
         request: Request;
         response: Response;
     }>>;
-    getPreview(handler: string, key: string): Promise<import("@umbraco-cms/backoffice/resources").UmbApiResponse<{
-        data: import("@jumoo/uSync").SyncItemPreviewResponse;
-        request: Request;
-        response: Response;
-    }>>;
 }

package/dist/repository/sources/SyncAction.source.js

@@ -53,10 +53,5 @@ export class uSyncActionDataSource {
             body: view,
         }));
     }
-    async getPreview(handler, key) {
-        return await tryExecute(__classPrivateFieldGet(this, _uSyncActionDataSource_host, "f"), ActionsService.getPreview({
-            query: { handler, key },
-        }), { disableNotifications: true });
-    }
 }
 _uSyncActionDataSource_host = new WeakMap();

package/dist/signalr/signalr.context.js

@@ -1,19 +1,20 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    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 __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
     if (kind === "m") throw new TypeError("Private method is not writable");
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _uSyncSignalRContext_instances, _uSyncSignalRContext_connection, _uSyncSignalRContext_connected, _uSyncSignalRContext_update, _uSyncSignalRContext_add, _uSyncSignalRContext_complete, _uSyncSignalRContext_setupConnection;
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _uSyncSignalRContext_instances, _uSyncSignalRContext_connection, _uSyncSignalRContext_auth, _uSyncSignalRContext_server, _uSyncSignalRContext_connect, _uSyncSignalRContext_clientId, _uSyncSignalRContext_connected, _uSyncSignalRContext_update, _uSyncSignalRContext_add, _uSyncSignalRContext_complete, _uSyncSignalRContext_setupConnection;
 import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
 import { UmbObjectState } from '@umbraco-cms/backoffice/observable-api';
 import { USYNC_SIGNALR_CONTEXT_TOKEN, } from '@jumoo/uSync';
 import { UMB_AUTH_CONTEXT } from '@umbraco-cms/backoffice/auth';
+import { UMB_SERVER_CONTEXT } from '@umbraco-cms/backoffice/server';
 import * as signalR from '@jumoo/uSync/external/signalr';
 import { uSyncSignalRReconnectPolicy } from './signalr-reconnect-policy.js';
 export class uSyncSignalRContext extends UmbControllerBase {
@@ -21,6 +22,9 @@ export class uSyncSignalRContext extends UmbControllerBase {
         super(host);
         _uSyncSignalRContext_instances.add(this);
         _uSyncSignalRContext_connection.set(this, void 0);
+        _uSyncSignalRContext_auth.set(this, void 0);
+        _uSyncSignalRContext_server.set(this, void 0);
+        _uSyncSignalRContext_clientId.set(this, null);
         _uSyncSignalRContext_connected.set(this, new UmbObjectState(false));
         this.connected = __classPrivateFieldGet(this, _uSyncSignalRContext_connected, "f").asObservable();
         _uSyncSignalRContext_update.set(this, new UmbObjectState(undefined));
@@ -31,12 +35,12 @@ export class uSyncSignalRContext extends UmbControllerBase {
         this.complete = __classPrivateFieldGet(this, _uSyncSignalRContext_complete, "f").asObservable();
         this.provideContext(USYNC_SIGNALR_CONTEXT_TOKEN, this);
         this.consumeContext(UMB_AUTH_CONTEXT, (auth) => {
-            if (!auth)
-                return;
-            const authConfig = auth?.getOpenApiConfiguration();
-            if (!authConfig)
-                return;
-            __classPrivateFieldGet(this, _uSyncSignalRContext_instances, "m", _uSyncSignalRContext_setupConnection).call(this, '/umbraco/SyncHub', auth);
+            __classPrivateFieldSet(this, _uSyncSignalRContext_auth, auth, "f");
+            __classPrivateFieldGet(this, _uSyncSignalRContext_instances, "m", _uSyncSignalRContext_connect).call(this);
+        });
+        this.consumeContext(UMB_SERVER_CONTEXT, (server) => {
+            __classPrivateFieldSet(this, _uSyncSignalRContext_server, server, "f");
+            __classPrivateFieldGet(this, _uSyncSignalRContext_instances, "m", _uSyncSignalRContext_connect).call(this);
         });
     }
     hostConnected() {
@@ -49,7 +53,7 @@ export class uSyncSignalRContext extends UmbControllerBase {
         });
     }
     getClientId() {
-        return __classPrivateFieldGet(this, _uSyncSignalRContext_connection, "f")?.connectionId ?? null;
+        return __classPrivateFieldGet(this, _uSyncSignalRContext_clientId, "f");
     }
     /**
      * Synchronous read of the current connection state - used by callers
@@ -75,11 +79,34 @@ export class uSyncSignalRContext extends UmbControllerBase {
         __classPrivateFieldGet(this, _uSyncSignalRContext_update, "f").setValue({ message, count: 0, total: 1 });
     }
 }
-_uSyncSignalRContext_connection = new WeakMap(), _uSyncSignalRContext_connected = new WeakMap(), _uSyncSignalRContext_update = new WeakMap(), _uSyncSignalRContext_add = new WeakMap(), _uSyncSignalRContext_complete = new WeakMap(), _uSyncSignalRContext_instances = new WeakSet(), _uSyncSignalRContext_setupConnection = function _uSyncSignalRContext_setupConnection(url, auth) {
+_uSyncSignalRContext_connection = new WeakMap(), _uSyncSignalRContext_auth = new WeakMap(), _uSyncSignalRContext_server = new WeakMap(), _uSyncSignalRContext_clientId = new WeakMap(), _uSyncSignalRContext_connected = new WeakMap(), _uSyncSignalRContext_update = new WeakMap(), _uSyncSignalRContext_add = new WeakMap(), _uSyncSignalRContext_complete = new WeakMap(), _uSyncSignalRContext_instances = new WeakSet(), _uSyncSignalRContext_connect = function _uSyncSignalRContext_connect() {
+    // either context being re-provided replaces the connection, so
+    // stop the old one rather than leave it running alongside.
+    if (__classPrivateFieldGet(this, _uSyncSignalRContext_connection, "f")) {
+        __classPrivateFieldGet(this, _uSyncSignalRContext_connection, "f").stop();
+        __classPrivateFieldSet(this, _uSyncSignalRContext_connection, undefined, "f");
+        __classPrivateFieldSet(this, _uSyncSignalRContext_clientId, null, "f");
+        __classPrivateFieldGet(this, _uSyncSignalRContext_connected, "f").setValue(false);
+    }
+    if (!__classPrivateFieldGet(this, _uSyncSignalRContext_auth, "f") || !__classPrivateFieldGet(this, _uSyncSignalRContext_server, "f"))
+        return;
+    if (!__classPrivateFieldGet(this, _uSyncSignalRContext_auth, "f").getOpenApiConfiguration())
+        return;
+    const connection = __classPrivateFieldGet(this, _uSyncSignalRContext_server, "f").getServerConnection();
+    // Older Umbraco versions do not expose this setting.
+    const skipNegotiation = 'getSignalRSkipNegotiation' in connection &&
+        typeof connection.getSignalRSkipNegotiation === 'function' &&
+        connection.getSignalRSkipNegotiation() === true;
+    __classPrivateFieldGet(this, _uSyncSignalRContext_instances, "m", _uSyncSignalRContext_setupConnection).call(this, '/umbraco/SyncHub', __classPrivateFieldGet(this, _uSyncSignalRContext_auth, "f"), skipNegotiation);
+}, _uSyncSignalRContext_setupConnection = function _uSyncSignalRContext_setupConnection(url, auth, skipNegotiation) {
     // the token is fetched on every (re)connect, so a reconnect after
     // the original token has expired still authenticates.
     __classPrivateFieldSet(this, _uSyncSignalRContext_connection, new signalR.HubConnectionBuilder()
-        .withUrl(url, { accessTokenFactory: () => auth.getLatestToken() })
+        .withUrl(url, {
+        accessTokenFactory: () => auth.getLatestToken(),
+        skipNegotiation,
+        transport: skipNegotiation ? signalR.HttpTransportType.WebSockets : undefined,
+    })
         .withAutomaticReconnect(new uSyncSignalRReconnectPolicy())
         .configureLogging(signalR.LogLevel.Warning)
         .build(), "f");
@@ -92,19 +119,39 @@ _uSyncSignalRContext_connection = new WeakMap(), _uSyncSignalRContext_connected
     __classPrivateFieldGet(this, _uSyncSignalRContext_connection, "f").on('complete', (data) => {
         __classPrivateFieldGet(this, _uSyncSignalRContext_complete, "f").setValue(data);
     });
-    __classPrivateFieldGet(this, _uSyncSignalRContext_connection, "f").start().then(() => {
-        __classPrivateFieldGet(this, _uSyncSignalRContext_connected, "f").setValue(true);
+    const connection = __classPrivateFieldGet(this, _uSyncSignalRContext_connection, "f");
+    // a stopped connection can still report state while it winds down,
+    // only the current one may update connected.
+    const setConnected = (connected) => {
+        if (__classPrivateFieldGet(this, _uSyncSignalRContext_connection, "f") !== connection)
+            return;
+        if (!connected)
+            __classPrivateFieldSet(this, _uSyncSignalRContext_clientId, null, "f");
+        __classPrivateFieldGet(this, _uSyncSignalRContext_connected, "f").setValue(connected);
+    };
+    // the connection id comes from the negotiate response, so when
+    // negotiation is skipped we have to ask the hub for it.
+    const onConnected = async () => {
+        const clientId = connection.connectionId ??
+            (await connection.invoke('GetConnectionId').catch(() => null));
+        if (__classPrivateFieldGet(this, _uSyncSignalRContext_connection, "f") !== connection)
+            return;
+        __classPrivateFieldSet(this, _uSyncSignalRContext_clientId, clientId, "f");
+        setConnected(true);
+    };
+    connection
+        .start()
+        .then(onConnected)
+        .catch((error) => {
+        // with negotiation skipped there is no transport fallback, so a
+        // blocked WebSocket ends here; status polling covers progress.
+        console.warn('uSync: SignalR connection failed', error);
+        setConnected(false);
     });
     // the client id changes on reconnect, requests made after this
     // pick up the new one via getClientId().
-    __classPrivateFieldGet(this, _uSyncSignalRContext_connection, "f").onreconnecting(() => {
-        __classPrivateFieldGet(this, _uSyncSignalRContext_connected, "f").setValue(false);
-    });
-    __classPrivateFieldGet(this, _uSyncSignalRContext_connection, "f").onreconnected(() => {
-        __classPrivateFieldGet(this, _uSyncSignalRContext_connected, "f").setValue(true);
-    });
-    __classPrivateFieldGet(this, _uSyncSignalRContext_connection, "f").onclose(() => {
-        __classPrivateFieldGet(this, _uSyncSignalRContext_connected, "f").setValue(false);
-    });
+    connection.onreconnecting(() => setConnected(false));
+    connection.onreconnected(onConnected);
+    connection.onclose(() => setConnected(false));
 };
 export default uSyncSignalRContext;

package/package.json

@@ -8,7 +8,7 @@
 	"homepage": "https://jumoo.co.uk/uSync",
 	"license": "MPL-2.0",
 	"type": "module",
-	"version": "17.5.2-prerelease.15",
+	"version": "17.5.2",
 	"main": "./dist/usync.js",
 	"types": "./dist/index.d.ts",
 	"module": "./dist/usync.js",

package/dist/components/usync-content-preview.d.ts

@@ -1,27 +0,0 @@
-import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-import { type PropertyValues, nothing } from '@umbraco-cms/backoffice/external/lit';
-import '@umbraco-cms/backoffice/components';
-import type { SyncItemPreviewResponse } from '../api';
-/**
- * Shows the current and incoming versions of a content or media item side by
- * side, laid out the way the backoffice editor shows them, with every value
- * rendered by its real property editor. Values that change are highlighted.
- */
-export declare class uSyncContentPreviewElement extends UmbLitElement {
-    #private;
-    preview?: SyncItemPreviewResponse;
-    /** the tab shown on both sides (by name) */
-    private _activeTab?;
-    /** the culture shown on both sides (undefined for invariant items) */
-    private _culture?;
-    private _onlyChanges;
-    protected willUpdate(changed: PropertyValues<this>): void;
-    render(): typeof nothing | import("lit-html").TemplateResult<1>;
-    static styles: import("lit").CSSResult;
-}
-export default uSyncContentPreviewElement;
-declare global {
-    interface HTMLElementTagNameMap {
-        'usync-content-preview': uSyncContentPreviewElement;
-    }
-}