chore(sdk): hedge against trailing slash on scheduler url

permaweb · Dec 19, 2023 · 8cf6ae2 · 8cf6ae2
1 parent b1308fd
commit 8cf6ae2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/sdk/package-lock.json b/sdk/package-lock.json
diff --git a/sdk/package.json b/sdk/package.json
@@ -28,7 +28,7 @@
     "test:integration": "cd ./test/e2e && npm test"
   },
   "dependencies": {
-    "@permaweb/ao-scheduler-utils": "~0.0.3",
+    "@permaweb/ao-scheduler-utils": "~0.0.4",
     "buffer": "^6.0.3",
     "debug": "^4.3.4",
     "hyper-async": "^1.1.2",

diff --git a/sdk/src/lib/message/verify-process.js b/sdk/src/lib/message/verify-process.js
@@ -2,7 +2,7 @@ import { Rejected, Resolved, fromPromise, of } from 'hyper-async'
 import { isNotNil, prop } from 'ramda'
 
 import { loadProcessMetaSchema, locateSchedulerSchema } from '../../dal.js'
-import { eqOrIncludes, parseTags } from '../utils.js'
+import { eqOrIncludes, parseTags, trimSlash } from '../utils.js'
 
 /**
  * @typedef Env5
@@ -25,7 +25,7 @@ function verifyProcessTagsWith ({ loadProcessMeta, locateScheduler }) {
   return (id) => {
     return of(id)
       .chain(locateScheduler)
-      .chain(({ url }) => loadProcessMeta({ suUrl: url, processId: id }))
+      .chain(({ url }) => loadProcessMeta({ suUrl: trimSlash(url), processId: id }))
       .map(prop('tags'))
       .map(parseTags)
       .chain(checkTag('Data-Protocol', eqOrIncludes('ao'), 'value \'ao\' was not found on process'))

diff --git a/sdk/src/lib/utils.js b/sdk/src/lib/utils.js
@@ -42,6 +42,11 @@ export function eqOrIncludes (val) {
   ])
 }
 
+export function trimSlash (str = '') {
+  if (!str.endsWith('/')) return str
+  return trimSlash(str.slice(0, -1))
+}
+
 export function errFrom (err) {
   err = err || { message: 'An error occurred' }