Allow customising port in setup

package-lock.json

@@ -35,7 +35,7 @@
         "lru-cache": "^11.0.2",
         "prettier-bytes": "^1.0.4",
         "sharp": "^0.33.4",
-        "snowtransfer": "^0.15.0",
+        "snowtransfer": "^0.14.2",
         "stream-mime-type": "^1.0.2",
         "try-to-catch": "^3.0.1",
         "uqr": "^0.1.2",
@@ -1464,6 +1464,18 @@
         "node": ">=22.0.0"
       }
     },
+    "node_modules/cloudstorm/node_modules/snowtransfer": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/snowtransfer/-/snowtransfer-0.15.0.tgz",
+      "integrity": "sha512-kEDGKtFiH5nSkHsDZonEUuDx99lUasJoZ7AGrgvE8HzVG59vjvqc//C+pjWj4DuJqTj4Q+Z1L/M/MYNim8F2VA==",
+      "license": "MIT",
+      "dependencies": {
+        "discord-api-types": "^0.38.21"
+      },
+      "engines": {
+        "node": ">=16.15.0"
+      }
+    },
     "node_modules/color": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
@@ -2719,12 +2731,12 @@
       }
     },
     "node_modules/snowtransfer": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/snowtransfer/-/snowtransfer-0.15.0.tgz",
-      "integrity": "sha512-kEDGKtFiH5nSkHsDZonEUuDx99lUasJoZ7AGrgvE8HzVG59vjvqc//C+pjWj4DuJqTj4Q+Z1L/M/MYNim8F2VA==",
+      "version": "0.14.2",
+      "resolved": "https://registry.npmjs.org/snowtransfer/-/snowtransfer-0.14.2.tgz",
+      "integrity": "sha512-Fi8OdRmaIgeCj58oVej+tQAoY2I+Xp/6PAYV8X93jE/2E6Anc87SbTbDV6WZXCnuzTQz3gty8JOGz02qI7Qs9A==",
       "license": "MIT",
       "dependencies": {
-        "discord-api-types": "^0.38.21"
+        "discord-api-types": "^0.38.8"
       },
       "engines": {
         "node": ">=16.15.0"
@@ -3076,9 +3088,9 @@
       }
     },
     "node_modules/tar-fs": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.3.tgz",
-      "integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz",
+      "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==",
       "license": "MIT",
       "dependencies": {
         "chownr": "^1.1.1",

package.json

@@ -44,7 +44,7 @@
     "lru-cache": "^11.0.2",
     "prettier-bytes": "^1.0.4",
     "sharp": "^0.33.4",
-    "snowtransfer": "^0.15.0",
+    "snowtransfer": "^0.14.2",
     "stream-mime-type": "^1.0.2",
     "try-to-catch": "^3.0.1",
     "uqr": "^0.1.2",

scripts/setup.js

@@ -120,16 +120,28 @@ function defineEchoHandler() {
 		/** @type {string} */ // @ts-ignore
 		const serverOrigin = await serverOriginPrompt.run()
 
+		console.log("OOYE has its own web server. It needs to be accessible on the public internet.")
+		console.log("What port would you like OOYE to use? You can connect your reverse proxy to this port later.")
+		/** @type {{socket: string | number}} */
+		const portResponse = await prompt({
+			type: "input",
+			name: "socket",
+			message: "Web server port",
+			initial: "6693"
+		})
+		portResponse.socket = +portResponse.socket || portResponse.socket // convert to number if numeric
+		
 		const app = createApp()
 		app.use(defineEchoHandler())
 		const server = createServer(toNodeListener(app))
-		await server.listen(6693)
+		await server.listen(portResponse.socket)
 
-		console.log("OOYE has its own web server. It needs to be accessible on the public internet.")
-		console.log("You need to enter a public URL where you will be able to host this web server.")
-		console.log("OOYE listens on localhost:6693, so you will probably have to set up a reverse proxy.")
+		console.log("Now you need to enter a public URL that OOYE's web server will live on.")
+		console.log("Set up your reverse proxy so that this URL accesses OOYE.")
 		console.log("Examples: https://gitdab.com/cadence/out-of-your-element/src/branch/main/docs/get-started.md#appendix")
-		console.log("Now listening on port 6693. Feel free to send some test requests.")
+		if (typeof portResponse.socket === "number") {
+			console.log(`Now listening on http://localhost:${portResponse.socket}. Feel free to send some test requests.`)
+		}
 		/** @type {{bridge_origin: string}} */
 		const bridgeOriginResponse = await prompt({
 			type: "input",
@@ -255,6 +267,7 @@ function defineEchoHandler() {
 		reg = {
 			...template,
 			url: bridgeOriginResponse.bridge_origin,
+			...portResponse,
 			ooye: {
 				...template.ooye,
 				...bridgeOriginResponse,

src/m2d/actions/setup-emojis.js

@@ -5,9 +5,8 @@ const {join} = require("path")
 
 const passthrough = require("../../passthrough")
 
-const {id} = require("../../../addbot")
-
 async function setupEmojis() {
+	const {id} = require("../../../addbot")
 	const {discord, db} = passthrough
 	const emojis = await discord.snow.assets.getAppEmojis(id)
 	for (const name of ["L1", "L2"]) {