corebasic 1.0.221 → 1.0.222

package/dist/libs/features.js

@@ -52,12 +52,14 @@ let appId = Utils.uid();
 let SERVICE_ADDRESS = process.env.APP_ENDPOINT || 'http://127.0.0.1:3000';
 export const get = feature => {
     const throwError = () => { throw new Error(`Feature ${feature} not found in internal or external list during Features.subscribe call`); };
-    let { api, service = SERVICE_ADDRESS, topic } = getFeature(feature) ?? SLYP_FEATURES_LIST[feature] ?? throwError();
+    const baseFeature = getFeature(feature);
+    let { api, service = SERVICE_ADDRESS, topic } = baseFeature ? baseFeature : (SLYP_FEATURES_LIST[feature] ?? throwError());
     return { api, service, topic };
 };
 export const send = async (meta, feature, data, params) => {
     const throwError = () => { throw new Error(`Feature ${feature} not found in internal or external list during inter feature call`); };
-    let { api, service = SERVICE_ADDRESS } = getFeature(feature) ?? SLYP_FEATURES_LIST[feature] ?? throwError();
+    const baseFeature = getFeature(feature);
+    let { api, service = SERVICE_ADDRESS } = baseFeature ? baseFeature : (SLYP_FEATURES_LIST[feature] ?? throwError());
     let method = getFeatureMethod(api);
     let url = getFeatureUrl(api);
     if (params || url.includes(':')) {
@@ -92,13 +94,12 @@ let appids = {};
 async function announce() {
     let exp_features = {};
     for (let [key, { api, subscribe }] of Object.entries(features))
-        exp_features[key] = { api, service: SERVICE_ADDRESS, subscribe };
+        exp_features[key] = { api, service: SERVICE_ADDRESS, subscribe, topic: "" };
     await Messaging.subscribe(`${process.env.REDIS_CHANNEL_PREFIX}_SLYP_FEATURES_LIST`, async (message, channel) => {
-        let msg = JSON.parse(message);
-        if (msg.uid !== appId && !appids[msg.uid]) {
-            appids[msg.uid] = true;
+        let { uid, ...msg } = JSON.parse(message);
+        if (uid !== appId && !appids[uid]) {
+            appids[uid] = true;
             SLYP_FEATURES_LIST = { ...SLYP_FEATURES_LIST, ...msg };
-            delete SLYP_FEATURES_LIST.uid;
             await Messaging.produce(`${process.env.REDIS_CHANNEL_PREFIX}_SLYP_FEATURES_LIST`, JSON.stringify({ ...exp_features, uid: appId }));
             await subscribe();
         }
@@ -187,15 +188,15 @@ async function registerHandler(features) {
         apis[feature.api] = apis[feature.api] ?? {};
         apis[feature.api][name] = feature;
         const featureName = name;
-        name = name.split('.');
-        let handler = name.pop();
-        name = `src/${name.join('/')}`;
-        if (name === 'src/transactions/query')
+        const nameParts = name.split('.');
+        let handler = nameParts.pop();
+        const featurePath = `src/${nameParts.join('/')}`;
+        if (featurePath === 'src/transactions/query')
             continue;
         if (featureName.startsWith("flows.") && !featureName.startsWith("flows.query.") && !featureName.startsWith("flows.command.") && !featureName.startsWith("flows.designs."))
             feature.handler = (await import(__rewriteRelativeImportExtension(`${new URL(`src/flows/query.js`, PROJECT_ROOT_URL).toString().replace('file://', '')}`))).FEATURE_HANDLERS[handler];
         else
-            feature.handler = (await import(__rewriteRelativeImportExtension(`${new URL(`${name}.js`, PROJECT_ROOT_URL).toString().replace('file://', '')}`)))[handler];
+            feature.handler = (await import(__rewriteRelativeImportExtension(`${new URL(`${featurePath}.js`, PROJECT_ROOT_URL).toString().replace('file://', '')}`)))[handler];
     }
 }
 function registerApi() {
@@ -335,7 +336,6 @@ async function subscribe() {
             catch (_) { }
             delete subscribed_consumers[key];
         }
-    let exp_features = {};
     for (let key in SLYP_FEATURES_LIST)
         if (!Utils.isEmpty(SLYP_FEATURES_LIST[key].subscribe)) {
             subscriptions[key] = SLYP_FEATURES_LIST[key].subscribe;

package/libs/features.ts

@@ -8,7 +8,26 @@ import axios from 'axios'
 // @ts-ignore
 import jwt from 'jsonwebtoken'
 
-let  features = {}
+export type Message = unknown
+export type Req = unknown
+export type Res = unknown
+export type Query = (req: Req, res: Res) => Promise<void>
+export type Command = (topic: string, message: Message, req?: Req, res?: Res) => Promise<void>
+type Handler = Query | Command
+
+
+type RemoteFeatureEntry = {
+    api: string
+    service: string
+    subscribe: string
+    topic: string
+    headers?: {JWT?: string, service?: boolean, NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN?: string}
+}
+
+type FeatureEntry = { api: string, topic: string, bypass: boolean, featureless: boolean, subscribe: string, handler: Handler }
+
+
+let features: Record<string, FeatureEntry> = {}
 let apis = {}
 
 const getFeatureMethod = api => api.split(' ')[0].toLowerCase()
@@ -39,20 +58,22 @@ async function loadLocalFeatures() {  // For Local Testing
     return data
 }
 
-let SLYP_FEATURES_LIST = await loadLocalFeatures()
+let SLYP_FEATURES_LIST: Record<string, RemoteFeatureEntry> = await loadLocalFeatures()
 let appId = Utils.uid()
 let SERVICE_ADDRESS = process.env.APP_ENDPOINT || 'http://127.0.0.1:3000'
 
 
 export const get = feature => {
     const throwError = () => {throw new Error(`Feature ${feature} not found in internal or external list during Features.subscribe call`)}
-    let {api, service = SERVICE_ADDRESS, topic} = getFeature(feature) ?? SLYP_FEATURES_LIST[feature] ?? throwError()
+    const baseFeature: FeatureEntry = getFeature(feature)
+    let {api, service = SERVICE_ADDRESS, topic} = baseFeature ? baseFeature as FeatureEntry & {service: string} : (SLYP_FEATURES_LIST[feature] ?? throwError())
     return {api, service, topic}
 }
 
 export const send = async (meta, feature, data, params) => {
     const throwError = () => {throw new Error(`Feature ${feature} not found in internal or external list during inter feature call`)}
-    let {api, service = SERVICE_ADDRESS} = getFeature(feature) ?? SLYP_FEATURES_LIST[feature] ?? throwError()
+    const baseFeature: FeatureEntry = getFeature(feature)
+    let {api, service = SERVICE_ADDRESS} = baseFeature ? baseFeature as FeatureEntry & {service: string} : (SLYP_FEATURES_LIST[feature] ?? throwError())
     let method = getFeatureMethod(api)
     let url = getFeatureUrl(api)
 
@@ -90,16 +111,15 @@ export const send = async (meta, feature, data, params) => {
 
 let appids = {}
 async function announce() {
-    let exp_features = {}
+    let exp_features: Record<string, RemoteFeatureEntry> = {}
     for (let [key, {api,subscribe}] of Object.entries(features))
-        exp_features[key] = {api, service: SERVICE_ADDRESS, subscribe}
+        exp_features[key] = {api, service: SERVICE_ADDRESS, subscribe, topic: ""}
 
     await Messaging.subscribe(`${process.env.REDIS_CHANNEL_PREFIX}_SLYP_FEATURES_LIST`, async (message, channel) => {
-        let msg = JSON.parse(message)
-        if (msg.uid !== appId && !appids[msg.uid]) {
-            appids[msg.uid] = true
+        let {uid, ...msg} = JSON.parse(message) as Record<string, RemoteFeatureEntry> & {uid: string}
+        if (uid !== appId && !appids[uid]) {
+            appids[uid] = true
             SLYP_FEATURES_LIST = {...SLYP_FEATURES_LIST, ...msg}
-            delete SLYP_FEATURES_LIST.uid
             await Messaging.produce(`${process.env.REDIS_CHANNEL_PREFIX}_SLYP_FEATURES_LIST`, JSON.stringify({...exp_features, uid: appId }))
             await subscribe()
         }
@@ -151,7 +171,7 @@ const apiHandler = async (req, res) => {
         if (method === "get") {
             try {
                 req.body = {...req.body, topic}
-                await feature.handler(req, res)
+                await (feature.handler as Query)(req, res)
             } catch (err) {
                 if (process.env.DEBUG_MODE)
                     console.log('Error: Feature: ', req.body?.feature ?? (featureless ? `Featureless Api:${featureless.api}` : undefined), err)
@@ -159,7 +179,7 @@ const apiHandler = async (req, res) => {
             }
         } else if (method !== "get" && feature.bypass) {
             try {
-                await feature.handler(topic, prepareMessage(req), req, res)
+                await (feature.handler as Command)(topic, prepareMessage(req), req, res)
             } catch (err) {
                 if (process.env.DEBUG_MODE)
                     console.log('Error: Feature: ', req.body?.feature ?? (featureless ? `Featureless Api:${featureless.api}` : undefined), err)
@@ -194,17 +214,17 @@ async function registerHandler(features) {
         apis[feature.api][name] = feature
         const featureName = name
 
-        name = name.split('.')
-        let handler = name.pop()
-        name = `src/${name.join('/')}`
+        const nameParts = name.split('.')
+        let handler = nameParts.pop()
+        const featurePath = `src/${nameParts.join('/')}`
 
-        if (name === 'src/transactions/query')
+        if (featurePath === 'src/transactions/query')
             continue
 
         if (featureName.startsWith("flows.") && !featureName.startsWith("flows.query.") && !featureName.startsWith("flows.command.") && !featureName.startsWith("flows.designs."))
             feature.handler = (await import(`${new URL(`src/flows/query.js`, PROJECT_ROOT_URL).toString().replace('file://', '')}`)).FEATURE_HANDLERS[handler]
         else
-            feature.handler = (await import(`${new URL(`${name}.js`, PROJECT_ROOT_URL).toString().replace('file://', '')}`))[handler]
+            feature.handler = (await import(`${new URL(`${featurePath}.js`, PROJECT_ROOT_URL).toString().replace('file://', '')}`))[handler]
     }
 }
 function registerApi() {
@@ -266,7 +286,7 @@ export const start = async (app, url, file) => {
                     // // TODO: use $useChunks: [] once support is added in dip insert
                     // await Dip.insert(globalMeta, `users.txns`, { _id: `${message.user}_${iso_date}_${message.txn}`, user: message.user, feature: message.feature, date: message.date, created: message.date, updated: message.date, status: "Queued" }, {idempotent: true}) // Can always update the status later
                     // TODO: Avoid duplicate processing
-                    await features[message.feature].handler(topic, message)
+                    await (features[message.feature].handler as Command)(topic, message)
                     await Dip.insert(globalMeta, "Features.txns", {_id: message.txn, status: "Processed"}, {idempotent: true})
                     break
                 } catch(err) {
@@ -348,7 +368,6 @@ async function subscribe() {
         }
 
 
-    let exp_features = {}
     for (let key in SLYP_FEATURES_LIST)
         if (!Utils.isEmpty(SLYP_FEATURES_LIST[key].subscribe)) {
             subscriptions[key] = SLYP_FEATURES_LIST[key].subscribe

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "corebasic",
   "type": "module",
-  "version": "1.0.221",
+  "version": "1.0.222",
   "description": "",
   "main": "dist/index.js",
   "types": "./index.ts",