corebasic 1.0.179 → 1.0.181

package/libs/dip.js

@@ -2,6 +2,7 @@ import * as Elabase from './elabase.js'
 
 export const start = Elabase.start
 
+export const operation = Elabase.operation
 export const insert = Elabase.insert
 export const query = Elabase.query
 export const update = Elabase.update

package/libs/elabase.js

@@ -54,35 +54,87 @@ export function start(dbName) {
     }
 }
 
+function generate_suffix(meta) {
 
-let isTransaction = false
-let transactions = []
-let stats = false
+    if (!meta || typeof meta !== 'object') {
+        throw {message: "Dip Error. Invalid meta"}
+    }
+    if ((typeof meta.company === 'string' && meta.company.trim() === "") || (typeof meta.company !== 'string' && !Array.isArray(meta.company)) || (Array.isArray(meta.company) && (!meta.company.length || meta.company.some(item => typeof item !== "string"|| item.trim() === "")))) {
+        throw {message: "Dip Error. Invalid meta.company"}
+    }
+    if ((typeof meta.outlet === 'string' && meta.outlet.trim() === "") || (typeof meta.outlet !== 'string' && !Array.isArray(meta.outlet)) || (Array.isArray(meta.outlet) && (!meta.outlet.length || meta.outlet.some(item => typeof item !== "string" || item.trim() === "")))) {
+        throw {message: "Dip Error. Invalid meta.outlet"}
+    }
+    if ((meta.suffix !== undefined && typeof meta.suffix !== 'string' && !Array.isArray(meta.suffix)) || (Array.isArray(meta.suffix) && meta.suffix.some(item => typeof item !== "string" || item.trim() === ""))) {
+        throw {message: "Dip Error. Invalid meta.suffix"}
+    } else if (typeof meta.suffix === 'string' && meta.suffix.trim() === "")
+        throw {message: "Dip Error. Invalid meta.suffix"}
+
+
+        let company = typeof meta.company == 'string' ? [meta.company] : (meta.company?.length ? meta.company : [])
+        let outlet = typeof meta.outlet == 'string' ? [meta.outlet] : (meta.outlet?.length ? meta.outlet : [])
+        let suffix = typeof meta.suffix == 'string' ? [meta.suffix] : (meta.suffix?.length ? meta.suffix : [])
+
+        company = company.filter(item => item.trim() !== "")
+        outlet = outlet.filter(item => item.trim() !== "")
+        suffix = suffix.filter(item => item.trim() !== "")
+
+        company = company.length ? company : [""]
+        outlet = outlet.length ? outlet : [""]
+        suffix = suffix.length ? suffix : [""]
+
+        company = new Set(company)
+        outlet = new Set(outlet)
+        suffix = new Set(suffix)
+
+        // console.log(company, outlet, suffix)
+        let suffixes = []
+        for (let c of company) {
+            for (let o of outlet) {
+                for (let s of suffix) {
+                    let pathSegments = [c, o, s].filter(segment => segment !== "");
+                    if (pathSegments.length > 0) {
+                        suffixes.push(pathSegments.join('/'));
+                    }
+                }
+            }
+        }
+
+        return suffixes
+}
+
+let isBranch = false
+let batches = []
 
-export function transactionBegin() {
-    isTransaction = true
-    transactions = []
+export function batchBegin() {
+    isBranch = true
+    batches = []
 }
-export function transactionAbort() {
-    isTransaction = false
-    transactions = []
+export function batchAbort() {
+    isBranch = false
+    batches = []
 }
-export function transactionReset() {
-    transactionAbort()
+export function batchReset() {
+    batchAbort()
 }
-export function transactionCommit(arg) {
-    let txns = transactions
-    let mode = transactions.some(txn => txn.insert || txn.update || txn.delete) ? "command" : "query"
-    isTransaction = false
-    transactions = []
+export function batchSubmit(arg) {
+    let txns = batches
+    let mode = batches.some(txn => txn.insert || txn.update || txn.delete) ? "command" : "query"
+    isBranch = false
+    batches = []
     return new Promise((resolve, reject) => resolve())
-    .then(() => execute({ "transaction": txns, mode, stats: arg?.stats ?? false, version: arg?.version, compression: arg?.compression, size: arg?.size }))
+    .then(() => execute({ "batch": txns, mode, version: arg?.version, compression: arg?.compression }))
     .then (result => {
-        Events.send("Elabase.transactionCommit", { response: result })
+        Events.send("Elabase.batchSubmit", { response: result })
         return result
     })
 }
 
+export const operation = async (name, extras) => {
+    return execute({ operation: name, ...extras })
+}
+
+
 export const insert = async (meta, collection, value, _id, extras) => {
     if (typeof collection !== "string") throw {message: "Error: collection type is not string in Dip.insert()"}
     // Multi Company Support
@@ -97,6 +149,7 @@ export const insert = async (meta, collection, value, _id, extras) => {
 
     var arg = {
         collection: collection,
+        suffix: generate_suffix(meta),
         insert: value,
         ...(meta.DIP_URL ? {DIP_URL: meta.DIP_URL} : {}),
         ...(meta.DIP_DB ? {db: meta.DIP_DB} : {}),
@@ -111,8 +164,8 @@ export const insert = async (meta, collection, value, _id, extras) => {
         throw {message: "Error: invalid _id in Dip.insert()"}
 
 
-    if (isTransaction) {
-        transactions.push(arg)
+    if (isBranch) {
+        batches.push(arg)
         return
     }
     arg.mode = "command"
@@ -140,14 +193,15 @@ export const query = async (meta, collection, query, options, extras) => {
 
     var arg = {
         collection: collection,
+        suffix: generate_suffix(meta),
         query: query,
         options: options ? options : {},
         ...(meta.DIP_URL ? {DIP_URL: meta.DIP_URL} : {}),
         ...(meta.DIP_DB ? {db: meta.DIP_DB} : {}),
     }
     arg = Object.assign(arg, extras)
-    if (isTransaction) {
-        transactions.push(arg)
+    if (isBranch) {
+        batches.push(arg)
         return
     }
     arg.mode = "query"
@@ -198,6 +252,7 @@ export const update = async (meta, collection, query, update, options, extras) =
 
     var arg = {
         collection: collection,
+        suffix: generate_suffix(meta),
         query: query,
         update: update,
         options: options ? options : {},
@@ -205,8 +260,8 @@ export const update = async (meta, collection, query, update, options, extras) =
         ...(meta.DIP_DB ? {db: meta.DIP_DB} : {}),
     }
     arg = Object.assign(arg, extras)
-    if (isTransaction) {
-        transactions.push(arg)
+    if (isBranch) {
+        batches.push(arg)
         return
     }
     arg.mode = "command"
@@ -218,7 +273,7 @@ export const update = async (meta, collection, query, update, options, extras) =
     })
 }
 
-export const remove = async (meta, collection, query, extras) => {
+export const remove = async (meta, collection, query, options, extras) => {
     // Multi Company Support
     if (Utils.isEmpty(meta?.company)) throw {message: "Error: meta argument not provided in Dip.remove()"}
     if (typeof collection !== "string") throw {message: "Error: collection type is not string in Dip.remove()"}
@@ -226,17 +281,23 @@ export const remove = async (meta, collection, query, extras) => {
     if (meta.company !== "GLOBAL")
         query.company = meta.company
     // ---------------------
+    if (Utils.isEmpty(query._id) && !meta.allowDangerousRemove) {
+        throw { message: "Error: Dip.remove() without _id blocked by default (Dangerous Operation). Set allowDangerousRemove key if intentional." }
+        return
+    }
 
     var arg = {
         collection: collection,
+        suffix: generate_suffix(meta),
         query: query,
         delete: true,
+        options: options ? options : {},
         ...(meta.DIP_URL ? {DIP_URL: meta.DIP_URL} : {}),
         ...(meta.DIP_DB ? {db: meta.DIP_DB} : {}),
     }
     arg = Object.assign(arg, extras)
-    if (isTransaction) {
-        transactions.push(arg)
+    if (isBranch) {
+        batches.push(arg)
         return
     }
     arg.mode = "command"
@@ -273,8 +334,6 @@ function execute(arg) {
         arg.engine = arg.engine ?? internal.engineName
         arg.compression = true // Compress all for now
 
-        if (stats)
-            arg.stats = true
 
         return config.useDipper  ? dipper(arg)
         : axios
@@ -285,7 +344,9 @@ function execute(arg) {
 //                  console.log(JSON.stringify(res.header, null, 4));
 //                  console.log(JSON.stringify(res.body, null, 4));
 
-                    return result.data
+                    let res = result.data.mode === "query" ? result.data.items : result.data
+                    res.stats = result.data.mode === "query" ? _ => result.data.stats : res.stats
+                    return res
                 })
 //       .catch(err => { console.log(err.message); console.log(err.response); return err});
 }

package/libs/features.js

@@ -118,9 +118,10 @@ function getFeaturelessFeature(req) {
 
 const apiHandler = async (req, res) => {
     let method = req.method.toLowerCase()
+    let featureless
     try {
         let feature = getFeature(req.body?.feature)
-        let featureless = feature ? undefined : (feature = getFeaturelessFeature(req))
+        featureless = feature ? undefined : (feature = getFeaturelessFeature(req))
 
         if (!req.body?.feature && !featureless) {
             console.warn(`Feature: feature not sent by client`)
@@ -150,7 +151,7 @@ const apiHandler = async (req, res) => {
                 await feature.handler({...req, headers: req.headers, body: {...req.body, topic} }, res)
             } catch (err) {
                 if (process.env.DEBUG_MODE)
-                    console.log('Error: Feature: ', req.body?.feature, err)
+                    console.log('Error: Feature: ', req.body?.feature ?? (featureless ? `Featureless Api:${featureless.api}` : undefined), err)
                 throw {status: 500, message: "Failed to GET feature", ...err}
             }
         } else if (method !== "get" && feature.bypass) {
@@ -158,14 +159,14 @@ const apiHandler = async (req, res) => {
                 await feature.handler(topic, prepareMessage(req), req, res)
             } catch (err) {
                 if (process.env.DEBUG_MODE)
-                    console.log('Error: Feature: ', req.body?.feature, err)
+                    console.log('Error: Feature: ', req.body?.feature ?? (featureless ? `Featureless Api:${featureless.api}` : undefined), err)
                 throw {status: 500, message: "Failed to POST feature", ...err}
             }
         } else
             await commandAction(req, res, topic)
     } catch (err) {
         if (process.env.DEBUG_MODE)
-            console.log('Error: Feature: ', req.body?.feature, err)
+            console.log('Error: Feature: ', req.body?.feature ?? (featureless ? `Featureless Api:${featureless.api}` : undefined), err)
         try { // Sometimes error occurs when disconnecting stream from front end
             res.status(err.status ?? 500).json(err)
         } catch (_) { }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "corebasic",
   "type": "module",
-  "version": "1.0.179",
+  "version": "1.0.181",
   "description": "",
   "main": "index.js",
   "scripts": {