Running on Glitch?

README.md

@@ -4,21 +4,15 @@ Send messages and photos to your own Telegram bot and have them appear
 in the Daily Notes page of your Roam graph.
 
 You don't need to run any software or servers other than this
-JavaScript plugin for your Roam graph.
+JavaScript plugin for your Roam graph and, your own copy of the proxy implemented here, which you can Remix on Glitch.
 
-## ⚠️ Warning!
+## Prerequisites
 
-If you use the default proxy URL as in the instructions below, your
-media files will get passed through a trusted middleman.
+You'll need a running instance of [binary-semaphore](https://github.com/cori/binary-semaphore) to point your `roam/js` script to. If you use the address in the `telegroam.js` file you'll be sending your mutex calls through an existing Glitch instance of that project, with no guarantees for continued maintenance or uptime, but the linked-to repo can help you get set up with your own copy on Glitch, and there's not much private data to be concerned about in using a shared instance. 
 
-You can run your own proxy easily using Heroku's free tier. This is
-how I run my proxy.
+You'll also want your own instance of the proxy implemented in _this_ project. Click the button below and you will get a Glitch Remix of the proxy with your very own proxy URL.
 
-Click the button below and Heroku will guide you through the whole
-thing with zero configuration or coding. You will end up with your
-very own proxy URL.
-
-[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy)
+[![Remix on Glitch](https://cdn.glitch.com/2703baf2-b643-4da7-ab91-7ee2a2d00b5b%2Fremix-button-v2.svg)](https://glitch.com/edit/#!/remix/telegroam-proxy)
 
 ### Why is a proxy necessary?
 
@@ -32,7 +26,7 @@ because of a bug. Instead we have to download via the proxy server.
 
 ## Installation
 
-I will make this more convenient later.
+This could be made more convenient....
 
 1. In Telegram, talk to @BotFather to create a new bot and get an API
    key for it.
@@ -41,17 +35,22 @@ I will make this more convenient later.
 
 3. Make a page in your Roam called [[Telegram Bot]].
 
-4. Paste these nodes somewhere on the [[Telegram Bot]] page:
+4. Paste these nodes somewhere on the [[Telegram Bot]] page and replace values as appropriate:
 
-   - Inbox Name:: [[Inbox]]
-   - API Key:: insert key you get from Telegram's bot system
-     - {{[[TODO]]}} update the Telegram API key above
-   - Trusted Media Proxy:: https://telegram-cors-proxy.herokuapp.com
-   - Latest Update ID::
+   - Inbox Name:: `[[Inbox]] or whatever page you want these to appear under`
+   - API Key:: `insert key you get from Telegram's bot system`
+   - Trusted Media Proxy:: `insert the public URL of the Glitch project you Remixed above`
+   - Latest Update ID:: `leave blank`
 
 5. Make a block with the text `{{[[roam/js]]}}`.
 
 6. Nested in that block, make a code block and paste the full contents
    of `telegroam.js` inside.
 
 7. Reload Roam.
+
+8. Send a message to your bot. It should appear on your Daily Notes page under the page heading you selected within a few moments.
+
+## Other notes
+
+Good news! A single instance of the both the `binary-semaphore` and `telegroam-proxy` projects can handle multiple Roam graphs / Telegram bot combinations. A Roam graph is a consumer of a bot, so multiple graphs can consume the "output" of a single bot by sharing the bot's API key, or each graph can be configured with its own bot key.

package.json

@@ -1,10 +1,11 @@
 {
   "name": "telegroam",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Send messages and photos to your own Telegram bot and have them appear in the Daily Notes page of your Roam graph.",
   "main": "proxy.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "start": "node proxy.js"
   },
   "repository": {
     "type": "git",
@@ -18,5 +19,8 @@
   "homepage": "https://github.com/mbrock/telegroam#readme",
   "dependencies": {
     "cors-anywhere": "^0.4.4"
+  },
+  "engines": {
+    "node": "14.x"
   }
 }

telegroam.js

@@ -242,10 +242,10 @@
 
         let url = urlWithParams(
           "https://www.openstreetmap.org/export/embed.html", {
-            layer: "mapnik",
-            bbox,
-            marker
-          })
+          layer: "mapnik",
+          bbox,
+          marker
+        })
 
         return {
           embed: `:hiccup[:iframe {
@@ -547,15 +547,16 @@
     let nonce =
       roamAlphaAPI.util.generateUID()
 
+    //  replace this with your own copy Remixed from glitch.com/~binary-semaphore
     let lockPath =
-      `https://binary-semaphore.herokuapp.com/lock/${lockId}/${nonce}`
+      `https://binary-semaphore.glitch.me/lock/${lockId}/${nonce}`
 
-    let acquirePath = `${lockPath}/acquire`
-    let releasePath = `${lockPath}/release`
+    let acquirePath = `${lockPath}`
+    let releasePath = `${lockPath}`
 
-    for (;;) {
+    for (; ;) {
       let result =
-        await fetch(acquirePath, { method: "POST" })
+        await fetch(acquirePath, { method: "PUT" })
 
       if (result.status === lockStatus.ok) {
         currentLockPath = lockPath
@@ -566,7 +567,7 @@
           console.log("telegroam: releasing lock")
           currentLockPath = null
           try {
-            await fetch(releasePath, { method: "POST" })
+            await fetch(releasePath, { method: "DELETE" })
           } catch (e) {
             console.error(e)
             throw e
@@ -581,7 +582,7 @@
   }
 
   async function updateFromTelegramContinuously() {
-    for (;;) {
+    for (; ;) {
       try {
         let result = await runWithMutualExclusionLock({
           waitSeconds: 30,