feat: allow webui to use custom ddp path

Author: Julusian

packages/webui/src/client/collections/lib.ts

@@ -69,22 +69,6 @@ export function getOrCreateMongoCollection(name: string): Mongo.Collection<any>
 	return newCollection
 }
 
-/**
- * Wrap an existing Mongo.Collection to have async methods. Primarily to convert the built-in Users collection
- * @param collection Collection to wrap
- * @param name Name of the collection
- */
-export function wrapMongoCollection<DBInterface extends { _id: ProtectedString<any> }>(
-	collection: Mongo.Collection<DBInterface>,
-	name: CollectionName
-): MongoCollection<DBInterface> {
-	const wrapped = new WrappedMongoCollection<DBInterface>(collection, name)
-
-	registerClientCollection(name, wrapped)
-
-	return wrapped
-}
-
 /**
  * Create a sync in-memory Mongo Collection (for ui temporary storage)
  * @param name Name of the collection (for logging)

packages/webui/src/meteor/ddp/client_convenience.js

@@ -18,7 +18,9 @@ import { Meteor } from '../meteor'
 // stream_client_common.js #RationalizingRelativeDDPURLs
 const runtimeConfig =
 	typeof window.__meteor_runtime_config__ !== 'undefined' ? window.__meteor_runtime_config__ : Object.create(null)
-const ddpUrl = runtimeConfig.DDP_DEFAULT_CONNECTION_URL || '/'
+// The backend injects DDP_DEFAULT_CONNECTION_URL as the full endpoint path (the client no longer
+// appends `/websocket` — see socket-stream-client/urls.js). Fall back to the Meteor default endpoint.
+const ddpUrl = runtimeConfig.DDP_DEFAULT_CONNECTION_URL || '/websocket'
 
 Meteor.connection = DDP.connect(ddpUrl)
 

packages/webui/src/meteor/meteor.d.ts

@@ -165,18 +165,6 @@ export namespace Meteor {
 	}
 	/** Pub/Sub **/
 
-	/** Login **/
-
-	function loginWithPassword(
-		user: Object | string,
-		password: string,
-		callback?: (error?: global_Error | Meteor.Error | Meteor.TypedError) => void
-	): void
-
-	function logout(callback?: (error?: global_Error | Meteor.Error | Meteor.TypedError) => void): void
-
-	/** Login **/
-
 	/** Connection **/
 	function reconnect(): void
 

packages/webui/src/meteor/socket-stream-client/urls.js

@@ -3,11 +3,9 @@ import { Meteor } from '../meteor'
 // @param url {String} URL to Meteor app, eg:
 //   "/" or "madewith.meteor.com" or "https://foo.meteor.com"
 //   or "ddp+sockjs://ddp--****-foo.meteor.com/sockjs"
-// @returns {String} URL to the endpoint with the specific scheme and subPath, e.g.
-// for scheme "http" and subPath "sockjs"
-//   "http://subdomain.meteor.com/sockjs" or "/sockjs"
-//   or "https://ddp--1234-foo.meteor.com/sockjs"
-function translateUrl(url, newSchemeBase, subPath) {
+// @returns {String} URL to the endpoint with the given scheme, e.g. for scheme "ws"
+//   "ws://subdomain.meteor.com/websocket" or "/websocket"
+function translateUrl(url, newSchemeBase) {
 	if (!newSchemeBase) {
 		newSchemeBase = 'http'
 	}
@@ -52,10 +50,9 @@ function translateUrl(url, newSchemeBase, subPath) {
 	// root. See also client_convenience.js #RationalizingRelativeDDPURLs
 	url = Meteor._relativeToSiteRootUrl(url)
 
-	if (url.endsWith('/')) return url + subPath
-	else return url + '/' + subPath
+	return url
 }
 
 export function toWebsocketUrl(url) {
-	return translateUrl(url, 'ws', 'websocket')
+	return translateUrl(url, 'ws')
 }

packages/webui/vite.config.mts

@@ -85,6 +85,10 @@ export default defineConfig(({ command }) => ({
 				target: `ws://127.0.0.1:3000`,
 				ws: true,
 			},
+			[basePath + '/ddp-next/websocket']: {
+				target: `ws://127.0.0.1:3000`,
+				ws: true,
+			},
 		},
 	},