@caruuto/caruuto-js 0.4.0 → 0.4.2

package/lib/extensions.js

@@ -1,6 +1,3 @@
-const fs = require('fs')
-const path = require('path')
-
 /*
 Each extension should be added to the CaruutoClient prototype, so that
 for example, the email extension can be used as:
@@ -36,18 +33,18 @@ module.exports = function (CaruutoClient, clientInstance) {
 ```
 */
 
+const emailExtension = require('./extensions/email')
+const tokensExtension = require('./extensions/tokens')
+
 // Load all extensions from the lib/extensions directory/
 module.exports = function (CaruutoClient, clientInstance) {
-  const extensionsDir = path.join(__dirname, 'extensions')
-  const files = fs.readdirSync(extensionsDir)
+  if (typeof emailExtension === 'function') {
+    emailExtension(CaruutoClient, clientInstance)
+  }
 
-  files.forEach(file => {
-    if (file.endsWith('.js')) {
-      const extension = require(path.join(extensionsDir, file))
+  if (typeof tokensExtension === 'function') {
+    tokensExtension(CaruutoClient, clientInstance)
+  }
 
-      if (typeof extension === 'function') {
-        extension(CaruutoClient, clientInstance)
-      }
-    }
-  })
+  // Add any other extensions here.
 }

package/lib/helpers.js

@@ -1,5 +1,5 @@
 const querystring = require('query-string')
-const url = require('url')
+const url = require('node:url')
 
 module.exports = function (CaruutoClient) {
   /**
@@ -49,6 +49,10 @@ module.exports = function (CaruutoClient) {
       url +=
         '/media' +
         (typeof this.mediaBucket === 'string' ? '/' + this.mediaBucket : '')
+
+      if (this.terminator === 'uploadFile') {
+        url += '/upload'
+      }
     } else if (this.collection) {
       url += '/' + options.version + '/' + this.collection
     } else if (this.searchPhrase) {
@@ -154,7 +158,7 @@ module.exports = function (CaruutoClient) {
    * @api private
    */
   CaruutoClient.prototype._createRequestObject = function (options) {
-    const parsedUri = new url.URL(options.uri)
+    const parsedUri = url.parse(options.uri)
     const requestObject = {
       ...options,
       uri: {

package/lib/performFetch.js

@@ -1,15 +1,16 @@
-const crossFetch = require('cross-fetch')
+// const crossFetch = require('cross-fetch')
 const debug = require('debug')('caruuto-js')
+const undici = require('undici')
 
 const resolveFetch = customFetch => {
   let _fetch
 
   if (customFetch) {
     _fetch = customFetch
-  } else if (typeof fetch === 'undefined') {
-    _fetch = crossFetch
+    // } else if (typeof fetch === 'undefined') {
+    //   _fetch = crossFetch
   } else {
-    _fetch = fetch
+    _fetch = undici.fetch
   }
 
   return (...args) => _fetch(...args)
@@ -38,13 +39,34 @@ module.exports = function (CaruutoClient) {
     }
 
     if (requestObject.body) {
-      options.body = JSON.stringify(requestObject.body)
-
-      if (options.headers['content-type'] !== 'application/json') {
-        options.headers['content-type'] = 'application/json'
+      // If the body is a FormData object, we need to handle it differently
+      if (this.terminator === 'uploadFile') {
+        options.body = requestObject.body
+      } else if (typeof requestObject.body === 'object') {
+        // If the body is an object, we need to stringify it
+        options.body = JSON.stringify(requestObject.body)
+      } else {
+        options.body = requestObject.body
       }
     }
 
+    if (
+      options.headers['content-type'] !== 'application/json' &&
+      this.terminator !== 'uploadFile'
+    ) {
+      options.headers['content-type'] = 'application/json'
+    }
+
+    // if (this.terminator === 'uploadFile') {
+    // If we are uploading a file, we need to set the content type to multipart/form-data
+    // options.headers['content-type'] = 'multipart/form-data'
+    // }
+
+    // If the request is a GET request, we don't need to set the body
+    if (requestObject.method === 'GET' || requestObject.method === 'HEAD') {
+      delete options.body
+    }
+
     // if (
     //   requestObject.headers &&
     //   requestObject.headers['content-type'] &&
@@ -57,6 +79,7 @@ module.exports = function (CaruutoClient) {
 
     debug(`Querying URI: ${decodeURIComponent(options.uri)}`)
 
+    // Make the request using fetch
     const response = await fetch(options.uri, options).catch(err => {
       return Promise.reject(err)
     })

package/lib/terminators.js

@@ -1,3 +1,7 @@
+// const FormData = require('form-data')
+const undici = require('undici')
+const { FormData } = undici
+
 module.exports = function (CaruutoClient) {
   /**
    * Create one/multiple documents or hooks
@@ -165,13 +169,25 @@ module.exports = function (CaruutoClient) {
   }
 
   /**
-   * Update the documents affect by the saved query
+   * Upload a file to the media bucket.
    *
-   * @param {Object} update
+   * @param {String} directory - The directory in the media bucket to upload the file
+   * @param {Object} buffer - The file buffer to upload
+   * @param {String} fileName - The name of the file to upload
+   * @param {String} mimeType - The MIME type of the file
+   * @param {Number} contentLength - The size of the file in bytes
+   * @description Upload a file to the media bucket.
+   * This method constructs a multipart/form-data request to upload a file.
    * @return Promise
    * @api public
    */
-  CaruutoClient.prototype.uploadFile = function (file) {
+  CaruutoClient.prototype.uploadFile = function (
+    directory,
+    fileName,
+    mimeType,
+    buffer,
+    contentLength
+  ) {
     this.terminator = 'uploadFile'
 
     const requestPayload = {
@@ -179,35 +195,23 @@ module.exports = function (CaruutoClient) {
       uri: this._buildURL()
     }
 
-    // this._setHeader('content-type', 'application/json')
+    const formData = new FormData()
 
-    // if (this._isValidHook()) {
-    //   requestPayload.body = update
+    console.log(directory, fileName, mimeType, buffer, contentLength)
 
-    //   this._setHeader('content-type', 'text/plain')
-    // } else {
-    //   if (this.isClient) {
-    //     if (!this.isClient.id && !this.isClient.self) {
-    //       throw new Error(
-    //         'Unable to run update on all clients. Please use whereClientIs() or whereClientIsSelf() filters.'
-    //       )
-    //     }
-
-    //     // Remove `clientId` from the payload.
-    //     if (update.clientId) {
-    //       delete update.clientId
-    //     }
-
-    //     requestPayload.body = update
-    //   } else {
-
-    requestPayload.body = {
-      file
+    try {
+      formData.append(
+        'file',
+        new Blob([buffer], { type: mimeType, size: contentLength }),
+        fileName
+      )
+      formData.append('directory', directory)
+    } catch (error) {
+      console.error('Error appending file to FormData:', error)
+      throw new Error('Failed to append file to FormData')
     }
-    // }
-    // }
 
-    console.log('requestPayload :>> ', requestPayload)
+    requestPayload.body = formData
 
     return this._createRequestObject(requestPayload)
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caruuto/caruuto-js",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "A high-level library for interacting with Caruuto",
   "exports": "./index.js",
   "scripts": {
@@ -16,7 +16,8 @@
     "got": "^11.0.0",
     "human-interval": "^2.0.1",
     "mocha": "^10.2.0",
-    "query-string": "5.0.1"
+    "query-string": "5.0.1",
+    "undici": "^5.29.0"
   },
   "repository": {
     "type": "git",
@@ -48,7 +49,7 @@
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.32.2",
-    "form-data": "^4.0.0",
+    "form-data": "^4.0.2",
     "husky": "^8.0.0",
     "lint-staged": "^12.5.0",
     "mockery": "^1.7.0",

package/x.js

@@ -1,9 +1,12 @@
 const { createClient } = require('./index')
 
+// https://caruuto.27.works/api
+// EYeRSSEtmcVF9OFhVHjcf1TcPLHbTpPgBbHVHIce1buYKHOCNB1A2NC4UoThmQhk
+
 ;(async () => {
   const x = createClient(
-    'https://localcaruuto.com/api',
-    '12345678900987654321',
+    'https://caruuto.27.works/api',
+    'EYeRSSEtmcVF9OFhVHjcf1TcPLHbTpPgBbHVHIce1buYKHOCNB1A2NC4UoThmQhk',
     { reservedProperties: ['created_at'] }
   )
 
@@ -31,7 +34,6 @@ const { createClient } = require('./index')
 
   // console.log('p :>> ', await x.create({ x: 1 }))
 
-  console.log('x :>> ', x)
   // console.log('x :>> ', x.email)
   // console.log('x :>> ', x.email.queue)
   // const xx = await x.email.queue({
@@ -42,7 +44,10 @@ const { createClient } = require('./index')
 
   // console.log('xx :>> ', xx)
 
-  const zz = await x.email.find({ sent: true })
+  x.in('retailers')
+  console.log('x :>> ', x)
+
+  const zz = await x.find({ sent: true })
 
   console.log('zz :>> ', zz)
 })()