@caruuto/caruuto-js 0.8.0 → 0.9.1

package/index.js

@@ -1,6 +1,9 @@
 const CaruutoClient = function (caruutoUrl, caruutoApiKey, options = {}) {
   this.options = options
   this.options.caruutoUrl = caruutoUrl
+    .replace(/\/api\/?$/, '')
+    .replace(/\/$/, '')
+    + '/api'
   this.options.caruutoApiKey = caruutoApiKey
 
   this.options.version = '1'

package/lib/extensions/ai.js

@@ -28,7 +28,7 @@ module.exports = function (CaruutoClient, clientInstance) {
       const body = buildRequestBody(opts, false)
       const response = await doFetch(
         this,
-        `${this.options.caruutoUrl}/api/ai/external`,
+        `${this.options.caruutoUrl}/ai/external`,
         body
       )
       return response.status === 204 ? undefined : response.json()
@@ -49,7 +49,7 @@ module.exports = function (CaruutoClient, clientInstance) {
       const body = buildRequestBody(opts, true)
       const response = await doFetch(
         this,
-        `${this.options.caruutoUrl}/api/ai/external`,
+        `${this.options.caruutoUrl}/ai/external`,
         body
       )
 
@@ -117,7 +117,7 @@ module.exports = function (CaruutoClient, clientInstance) {
         throw new Error('projectId is required')
       }
 
-      const url = `${this.options.caruutoUrl}/api/ai/conversations/${conversationId}/end`
+      const url = `${this.options.caruutoUrl}/ai/conversations/${conversationId}/end`
       const response = await doFetch(this, url, { project_id: projectId })
       return response.json()
     }.bind(clientInstance),
@@ -167,7 +167,7 @@ module.exports = function (CaruutoClient, clientInstance) {
 
       const response = await doFetch(
         this,
-        `${this.options.caruutoUrl}/api/ai/context`,
+        `${this.options.caruutoUrl}/ai/context`,
         body
       )
       return response.json()
@@ -220,21 +220,35 @@ module.exports = function (CaruutoClient, clientInstance) {
      * @param {'conversation'|'question_cache'} opts.source
      * @returns {Promise<{ id: string }>}  New conversation ID
      */
-    forkConversation: async function ({ sourceId, projectId, source = 'conversation' } = {}) {
+    forkConversation: async function ({
+      sourceId,
+      projectId,
+      source = 'conversation'
+    } = {}) {
       if (!sourceId) throw new Error('sourceId is required')
       if (!projectId) throw new Error('projectId is required')
 
-      const url = `${this.options.caruutoUrl}/api/ai/conversations/${sourceId}/fork`
-      const response = await doFetch(this, url, { project_id: projectId, source })
+      const url = `${this.options.caruutoUrl}/ai/conversations/${sourceId}/fork`
+      const response = await doFetch(this, url, {
+        project_id: projectId,
+        source
+      })
       return response.json()
     }.bind(clientInstance),
 
-    shareConversation: async function ({ conversationId, projectId, visibility = 'public' } = {}) {
+    shareConversation: async function ({
+      conversationId,
+      projectId,
+      visibility = 'public'
+    } = {}) {
       if (!conversationId) throw new Error('conversationId is required')
       if (!projectId) throw new Error('projectId is required')
 
-      const url = `${this.options.caruutoUrl}/api/ai/conversations/${conversationId}/share`
-      const response = await doFetch(this, url, { project_id: projectId, visibility })
+      const url = `${this.options.caruutoUrl}/ai/conversations/${conversationId}/share`
+      const response = await doFetch(this, url, {
+        project_id: projectId,
+        visibility
+      })
       return response.json()
     }.bind(clientInstance),
 
@@ -250,7 +264,7 @@ module.exports = function (CaruutoClient, clientInstance) {
       if (!conversationId) throw new Error('conversationId is required')
 
       const fetch = this.options.fetch || undici.fetch
-      const url = `${this.options.caruutoUrl}/api/ai/conversations/${conversationId}/public`
+      const url = `${this.options.caruutoUrl}/ai/conversations/${conversationId}/public`
 
       const response = await fetch(url, { method: 'GET' })
 
@@ -276,7 +290,11 @@ module.exports = function (CaruutoClient, clientInstance) {
         throw new Error('projectId is required')
       }
 
-      const url = `${this.options.caruutoUrl}/api/ai/conversations/${conversationId}?project_id=${encodeURIComponent(projectId)}`
+      const url = `${
+        this.options.caruutoUrl
+      }/ai/conversations/${conversationId}?project_id=${encodeURIComponent(
+        projectId
+      )}`
       const response = await doGet(this, url)
       return response.json()
     }.bind(clientInstance),
@@ -316,7 +334,7 @@ module.exports = function (CaruutoClient, clientInstance) {
       if (leadEmail) body.lead_email = leadEmail
       if (leadName) body.lead_name = leadName
 
-      const url = `${this.options.caruutoUrl}/api/ai/conversations/${conversationId}/turn`
+      const url = `${this.options.caruutoUrl}/ai/conversations/${conversationId}/turn`
       const response = await doFetch(this, url, body)
       return response.json()
     }.bind(clientInstance),
@@ -359,7 +377,7 @@ module.exports = function (CaruutoClient, clientInstance) {
       if (linkLabel) body.link_label = linkLabel
       if (messageIndex !== undefined) body.message_index = messageIndex
 
-      const trackUrl = `${this.options.caruutoUrl}/api/ai/conversations/${conversationId}/link-click`
+      const trackUrl = `${this.options.caruutoUrl}/ai/conversations/${conversationId}/link-click`
       const response = await doFetch(this, trackUrl, body)
       return response.json()
     }.bind(clientInstance)
@@ -427,7 +445,9 @@ async function doGet(client, url) {
       if (data.error) {
         err.message = data.error
       }
-    } catch (_) {}
+    } catch (_) {
+      // Ignore JSON parsing errors and use the default error message
+    }
 
     throw err
   }
@@ -456,7 +476,9 @@ async function doFetch(client, url, body) {
       if (data.error) {
         err.message = data.error
       }
-    } catch (_) {}
+    } catch (_) {
+      // Ignore JSON parsing errors and use the default error message
+    }
 
     throw err
   }

package/lib/helpers.js

@@ -59,7 +59,7 @@ module.exports = function (CaruutoClient) {
     }
 
     if (options.collections) {
-      url = this.options.caruutoUrl + '/api/contentTypes'
+      url = this.options.caruutoUrl + '/contentTypes'
     }
 
     if (this.count) {

package/lib/performFetch.js

@@ -67,7 +67,9 @@ module.exports = function (CaruutoClient) {
         if (responseData.errors) {
           err.errors = responseData.errors
         }
-      } catch (_) {}
+      } catch (_) {
+        // Ignore JSON parsing errors and use the default error message
+      }
 
       return Promise.reject(err)
     }

package/lib/terminators.js

@@ -128,7 +128,7 @@ module.exports = function (CaruutoClient) {
 
     const requestPayload = {
       method: 'POST',
-      uri: this.options.caruutoUrl + '/api/media/upload'
+      uri: this.options.caruutoUrl + '/media/upload'
     }
 
     const formData = new FormData()

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@caruuto/caruuto-js",
-  "version": "0.8.0",
+  "version": "0.9.1",
   "description": "A high-level library for interacting with Caruuto",
   "exports": "./index.js",
   "scripts": {
-    "test": "eslint --ext js,jsx . && prettier --write '**/*.{js,jsx,md,html,css}' && NODE_ENV=test mocha {test,core/test}/**/*.js",
+    "test": "eslint --ext js,jsx . && prettier --write '**/*.{js,jsx,md,html,css}' && NODE_ENV=test mocha test/**/*.js",
     "posttest": "./scripts/coverage.js"
   },
   "author": "Jim Lambie <jim@27.works>",
@@ -50,4 +50,4 @@
     "should": "^9.0.2",
     "sinon": "^4.5.0"
   }
-}
+}