@cocreate/crud-server 1.28.2 → 1.28.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/crud-server",
-  "version": "1.28.2",
+  "version": "1.28.3",
   "description": "CoCreate-crud-server",
   "keywords": [
     "cocreate-crud",
@@ -34,7 +34,7 @@
     "url": "git+https://github.com/CoCreate-app/CoCreate-crud-server.git"
   },
   "author": "CoCreate LLC",
-  "license": "SSPL-1.0",
+  "license": "AGPL-3.0",
   "bugs": {
     "url": "https://github.com/CoCreate-app/CoCreate-crud-server/issues"
   },

package/src/index.js

@@ -49,18 +49,14 @@ class CoCreateCrudServer {
             for (let i = 0; i < method.length; i++) {
                 for (let j = 0; j < type.length; j++) {
                     const action = method[i] + '.' + type[j];
-                    this.wsManager.on(action, (socket, data) => this.crud(socket, data))
+                    this.wsManager.on(action, (data) =>
+                        this.send(data))
                 }
             }
         }
     }
 
     async send(data) {
-        data = await this.crud('', data)
-        return data
-    }
-
-    async crud(socket, data) {
         return new Promise(async (resolve) => {
             try {
                 if (!data.organization_id || !this.config)
@@ -121,9 +117,7 @@ class CoCreateCrudServer {
                 if (data.method.startsWith('update') && data.upsert != false)
                     data.upsert = true
 
-                let action = data.method.replace(/\.([a-z])/g, (_, match) => match.toUpperCase());
-                // TODO: support stats from multiple dbs 
-                if (data.array || data.method === 'databaseStats') {
+                if (data.array) {
                     if (!data.database)
                         data['database'] = data.organization_id
 
@@ -150,7 +144,7 @@ class CoCreateCrudServer {
                                 }
                             }
 
-                            this[action](platformUpdate)
+                            this.send(platformUpdate)
                         }
 
                     }
@@ -169,21 +163,23 @@ class CoCreateCrudServer {
                         if (storage.provider && this.databases[storage.provider]) {
                             if (!Array.isArray(storage.url))
                                 storage.url = [storage.url]
-                            for (let i = 0; i < storage.url.length; i++) {
+
+                            for (let j = 0; j < storage.url.length; j++) {
                                 data['storageName'] = data.storage[i]
-                                data['storageUrl'] = storage.url[i]
-                                data = await this.databases[storage.provider][action](data)
+                                data['storageUrl'] = storage.url[j]
+
+                                data = await this.databases[storage.provider].send(data)
                             }
 
-                            if (data.filter) {
+                            if (data.$filter) {
                                 if (!data.type)
                                     data.type = data.method.split('.').pop()
-                                if (data.filter.sort && data.filter.sort.length)
-                                    data[data.type] = sortData(array, data.filter.sort)
-                                if (data.filter.index && data.filter.limit) {
-                                    data[data.type] = data[data.type].slice(data.filter.index, data.filter.limit)
-                                }
-                                data.filter.count = data[data.type].length
+                                if (data.$filter.sort && data.$filter.sort.length)
+                                    data[data.type] = sortData(array, data.$filter.sort)
+                                if (data.$filter.index && data.$filter.limit)
+                                    data[data.type] = data[data.type].slice(data.$filter.index, data.$filter.limit)
+
+                                data.$filter.count = data[data.type].length
                             }
 
                         }
@@ -193,26 +189,26 @@ class CoCreateCrudServer {
                 delete data.storageUrl
                 delete data.storageName
 
-                if (socket) {
-                    if (data.organization_id === this.config.organization_id && socket.config.organization_id !== data.organization_id) {
+                if (data.socket) {
+                    if (data.organization_id === this.config.organization_id && data.socket.config.organization_id !== data.organization_id) {
                         this.wsManager.broadcast({
                             config: {
                                 organization_id: this.config.organization_id,
                             }
                         }, { ...data });
-                        data.organization_id = socket.config.organization_id
+                        data.organization_id = data.socket.config.organization_id
                     }
 
-                    this.wsManager.broadcast(socket, data);
+                    this.wsManager.broadcast(data);
                     process.emit('changed-object', data)
                     resolve()
                 } else {
                     resolve(data)
                 }
             } catch (error) {
-                if (socket) {
+                if (data.socket) {
                     this.errorHandler(data, error)
-                    this.wsManager.send(socket, data);
+                    this.wsManager.send(data);
                     resolve()
                 } else {
                     resolve(data)