@hocuspocus/provider 2.9.0-rc.0 → 2.9.1-rc.0

package/dist/packages/provider/src/TiptapCollabProvider.d.ts

@@ -1,13 +1,17 @@
 import type { AbstractType, YArrayEvent } from 'yjs';
 import { HocuspocusProvider, HocuspocusProviderConfiguration } from './HocuspocusProvider.js';
 import { TiptapCollabProviderWebsocket } from './TiptapCollabProviderWebsocket.js';
-import type { THistoryVersion } from './types';
-export type TiptapCollabProviderConfiguration = Required<Pick<HocuspocusProviderConfiguration, 'name'>> & Partial<HocuspocusProviderConfiguration> & (Required<Pick<AdditionalTiptapCollabProviderConfiguration, 'websocketProvider'>> | Required<Pick<AdditionalTiptapCollabProviderConfiguration, 'appId'>>);
+import type { THistoryVersion } from './types.js';
+export type TiptapCollabProviderConfiguration = Required<Pick<HocuspocusProviderConfiguration, 'name'>> & Partial<HocuspocusProviderConfiguration> & (Required<Pick<AdditionalTiptapCollabProviderConfiguration, 'websocketProvider'>> | Required<Pick<AdditionalTiptapCollabProviderConfiguration, 'appId'>> | Required<Pick<AdditionalTiptapCollabProviderConfiguration, 'baseUrl'>>);
 export interface AdditionalTiptapCollabProviderConfiguration {
     /**
      * A Hocuspocus Cloud App ID, get one here: https://cloud.tiptap.dev
      */
     appId?: string;
+    /**
+     * If you are using the on-premise version of TiptapCollab, put your baseUrl here (e.g. https://collab.yourdomain.com)
+     */
+    baseUrl?: string;
     websocketProvider?: TiptapCollabProviderWebsocket;
 }
 export declare class TiptapCollabProvider extends HocuspocusProvider {

package/dist/packages/provider/src/TiptapCollabProviderWebsocket.d.ts

@@ -4,7 +4,11 @@ export interface AdditionalTiptapCollabProviderWebsocketConfiguration {
     /**
      * A Hocuspocus Cloud App ID, get one here: https://cloud.tiptap.dev
      */
-    appId: string;
+    appId?: string;
+    /**
+     * If you are using the on-premise version of TiptapCollab, put your baseUrl here (e.g. https://collab.yourdomain.com)
+     */
+    baseUrl?: string;
 }
 export declare class TiptapCollabProviderWebsocket extends HocuspocusProviderWebsocket {
     constructor(configuration: TiptapCollabProviderWebsocketConfiguration);

package/dist/packages/server/src/Hocuspocus.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { IncomingMessage } from 'http';
 import WebSocket, { AddressInfo } from 'ws';
-import { Server as HocuspocusServer } from './Server';
+import { Server as HocuspocusServer } from './Server.js';
 import { Debugger } from './Debugger.js';
 import { DirectConnection } from './DirectConnection.js';
 import Document from './Document.js';

package/dist/packages/server/src/Server.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { IncomingMessage, Server as HTTPServer, ServerResponse } from 'http';
 import { WebSocketServer } from 'ws';
-import { Hocuspocus } from './Hocuspocus';
+import { Hocuspocus } from './Hocuspocus.js';
 export declare class Server {
     httpServer: HTTPServer;
     webSocketServer: WebSocketServer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hocuspocus/provider",
-  "version": "2.9.0-rc.0",
+  "version": "2.9.1-rc.0",
   "description": "hocuspocus provider",
   "homepage": "https://hocuspocus.dev",
   "keywords": [
@@ -29,7 +29,7 @@
     "dist"
   ],
   "dependencies": {
-    "@hocuspocus/common": "^2.9.0-rc.0",
+    "@hocuspocus/common": "^2.9.1-rc.0",
     "@lifeomic/attempt": "^3.0.2",
     "lib0": "^0.2.87",
     "ws": "^8.14.2"

package/src/TiptapCollabProvider.ts

@@ -5,13 +5,14 @@ import {
 } from './HocuspocusProvider.js'
 
 import { TiptapCollabProviderWebsocket } from './TiptapCollabProviderWebsocket.js'
-import type { THistoryVersion } from './types'
+import type { THistoryVersion } from './types.js'
 
 export type TiptapCollabProviderConfiguration =
   Required<Pick<HocuspocusProviderConfiguration, 'name'>> &
   Partial<HocuspocusProviderConfiguration> &
   (Required<Pick<AdditionalTiptapCollabProviderConfiguration, 'websocketProvider'>> |
-  Required<Pick<AdditionalTiptapCollabProviderConfiguration, 'appId'>>)
+  Required<Pick<AdditionalTiptapCollabProviderConfiguration, 'appId'>>|
+  Required<Pick<AdditionalTiptapCollabProviderConfiguration, 'baseUrl'>>)
 
 export interface AdditionalTiptapCollabProviderConfiguration {
   /**
@@ -19,6 +20,11 @@ export interface AdditionalTiptapCollabProviderConfiguration {
    */
   appId?: string,
 
+  /**
+   * If you are using the on-premise version of TiptapCollab, put your baseUrl here (e.g. https://collab.yourdomain.com)
+   */
+  baseUrl?: string
+
   websocketProvider?: TiptapCollabProviderWebsocket
 }
 
@@ -27,7 +33,7 @@ export class TiptapCollabProvider extends HocuspocusProvider {
 
   constructor(configuration: TiptapCollabProviderConfiguration) {
     if (!configuration.websocketProvider) {
-      configuration.websocketProvider = new TiptapCollabProviderWebsocket({ appId: (configuration as Required<Pick<AdditionalTiptapCollabProviderConfiguration, 'appId'>>).appId })
+      configuration.websocketProvider = new TiptapCollabProviderWebsocket({ appId: (configuration as Required<Pick<AdditionalTiptapCollabProviderConfiguration, 'appId'>>).appId, baseUrl: (configuration as Required<Pick<AdditionalTiptapCollabProviderConfiguration, 'baseUrl'>>).baseUrl })
     }
 
     if (!configuration.token) {

package/src/TiptapCollabProviderWebsocket.ts

@@ -11,11 +11,16 @@ export interface AdditionalTiptapCollabProviderWebsocketConfiguration {
   /**
    * A Hocuspocus Cloud App ID, get one here: https://cloud.tiptap.dev
    */
-  appId: string,
+  appId?: string,
+
+  /**
+   * If you are using the on-premise version of TiptapCollab, put your baseUrl here (e.g. https://collab.yourdomain.com)
+   */
+  baseUrl?: string
 }
 
 export class TiptapCollabProviderWebsocket extends HocuspocusProviderWebsocket {
   constructor(configuration: TiptapCollabProviderWebsocketConfiguration) {
-    super({ ...configuration as HocuspocusProviderWebsocketConfiguration, url: `wss://${configuration.appId}.collab.tiptap.cloud` })
+    super({ ...configuration as HocuspocusProviderWebsocketConfiguration, url: configuration.baseUrl ?? `wss://${configuration.appId}.collab.tiptap.cloud` })
   }
 }