Merge pull request #276 from module-federation/release-0-1-0

fix threadpool, datasource and cache loading

Author: tysonrm

package.json

@@ -8,7 +8,7 @@
   "license": "Apache-2.0",
   "scripts": {
     "start": "./start.sh",
-    "build": "npm run build:esm && npm run build:cjs",
+    "build": "npm run build:esm && npm run build:cjs && cd ../aegis/wasm && yarn build && yarn deploy",
     "watch": "node watch.mjs",
     "webswitch": "cd ../aegis-host ; export SWITCH=true ; export PORT=8888 ; yarn start",
     "build:esm": "babel --delete-dir-on-start -d esm/ src/ && cp src/index.js esm",
@@ -32,6 +32,7 @@
     "assemblyscript": "0.25.2",
     "cors": "^2.8.5",
     "dotenv": "16.0.1",
+    "express": "^4.18.2",
     "express-fileupload": "^1.4.0",
     "express-jwt": "7.7.5",
     "import-fresh": "3.3.0",
@@ -70,8 +71,8 @@
     "jsdoc-to-markdown": "7.1.1",
     "mocha": "10.0.0",
     "mocha-esm": "1.1.1",
-    "pretty-cli": "^0.0.14",
     "prettier": "^2.8.1",
+    "pretty-cli": "^0.0.14",
     "split": "1.0.1",
     "standard": "^17.0.0",
     "yarn": "1.22.19"

src/adapters/controllers/get-content.js

@@ -2,7 +2,7 @@
 
 import ModelFactory from '../../domain'
 
-function prettifyJson(json) {
+function prettifyJson (json) {
   if (typeof json !== 'string') {
     json = JSON.stringify(json, null, 2)
   }
@@ -27,7 +27,7 @@ function prettifyJson(json) {
   )
 }
 
-function getResourceName(httpRequest, defaultTitle = '') {
+function getResourceName (httpRequest, defaultTitle = '') {
   if (/events/i.test(httpRequest.query.details)) return 'Domain Events'
   if (/threads/i.test(httpRequest.query.details)) return 'Thread Pools'
   if (/data/i.test(httpRequest.query.details)) return 'Data Sources'
@@ -37,7 +37,7 @@ function getResourceName(httpRequest, defaultTitle = '') {
   return defaultTitle
 }
 
-function findLocalRelatedModels(modelName) {
+function findLocalRelatedModels (modelName) {
   const localModels = ModelFactory.getModelSpecs().map(s =>
     s.modelName.toUpperCase()
   )
@@ -60,7 +60,7 @@ function findLocalRelatedModels(modelName) {
  * @returns
  */
 
-export default function getContent(httpRequest, content, defaultTitle) {
+export default function getContent (httpRequest, content, defaultTitle) {
   const contents = content instanceof Array ? content : [content]
   try {
     if (!httpRequest.query.html)
@@ -169,14 +169,14 @@ export default function getContent(httpRequest, content, defaultTitle) {
 
         html += '<div class="mb3">'
         ModelFactory.getModelSpecs().forEach(s => {
-          html += `<a href="${httpRequest.path}?${queryText}modelName=${s.modelName}">View thread info for ${s.modelName}</a><br>`
+          html += `<a href="${httpRequest.path}?${queryText}modelName=${s.modelName}">View data in ${s.modelName} thread</a><br>`
           try {
             console.debug(httpRequest.query.details === 'data')
             if (httpRequest.query.details === 'data') {
               const related = findLocalRelatedModels(s.modelName)
               related.forEach(
-                rel =>
-                  (html += `<a href="${httpRequest.path}?${queryText}modelName=${s.modelName}&poolName=${rel}">View ${s.modelName} thread info for ${rel}</a><br>`)
+                relModel =>
+                  (html += `<a href="${httpRequest.path}?${queryText}modelName=${s.modelName}&poolName=${relModel}">View ${relModel} data from ${s.modelName} thread</a><br>`)
               )
             }
           } catch (error) {

src/adapters/controllers/index.js

@@ -26,19 +26,19 @@ import anyInvokePortFactory from './post-invoke-port'
 import makeLiveUpdate from './live-update'
 import makeLiveRollout from './live-rollout'
 
-function make(useCases, controllerFactory) {
+function make (useCases, controllerFactory) {
   return useCases().map(uc => ({
     endpoint: uc.endpoint,
     path: uc.path,
     ports: uc.ports,
-    fn: controllerFactory(uc.fn),
+    fn: controllerFactory(uc.fn)
   }))
 }
 
 export const postModels = () => make(createModels, postModelFactory)
 export const patchModels = () => make(editModels, patchModelFactory)
 export const getModels = () => make(listModels, getModelsFactory)
-export const getModelsById = () => make(findModels, getModelByIdFactory)
+export const getModelById = () => make(findModels, getModelByIdFactory)
 export const deleteModels = () => make(removeModels, deleteModelFactory)
 export const anyInvokePorts = () => make(invokePorts, anyInvokePortFactory)
 export const liveUpdate = () => make(hotReload, makeLiveUpdate)
@@ -51,14 +51,14 @@ export const initCache = () => {
   const specs = loadModels()
   registerEvents()
 
-  async function loadModelInstances() {
+  async function loadModelInstances () {
     console.time(label)
     await Promise.allSettled(specs.map(async m => (m && m.fn ? m.fn() : false)))
     console.timeEnd(label)
   }
 
   return {
-    load: () => loadModelInstances(),
+    load: () => loadModelInstances()
   }
 }
 

src/adapters/datasources/datasource-mongodb.js

@@ -309,6 +309,7 @@ export class DataSourceMongoDb extends DataSource {
   async streamList (options) {
     const pipeArgs = []
 
+    console.log('streamList')
     try {
       const paginate = new Transform({
         writableObjectMode: true,
@@ -391,7 +392,7 @@ export class DataSourceMongoDb extends DataSource {
       }
       console.log({ options })
 
-      if (options.streamResult) return this.streamList(options)
+      if (param.streamResult) return this.streamList(param)
 
       const data = (await this.mongoFind(options)).toArray()
       const count = data?.length

src/aegis.js

@@ -7,15 +7,15 @@ const { EventBrokerFactory, DomainEvents, importRemotes, requestContext } =
 const { badUserRoute, reload } = DomainEvents
 const { pathToRegexp, match } = require('path-to-regexp')
 const { nanoid } = require('nanoid')
-const { EventEmitter } = require('stream')
+const { EventEmitter } = require('node:stream')
 const broker = EventBrokerFactory.getInstance()
 
 const {
   deleteModels,
   getConfig,
   getRoutes,
   getModels,
-  getModelsById,
+  getModelById,
   http,
   initCache,
   patchModels,
@@ -35,7 +35,7 @@ const endpointPortId = e => `${modelPath}/${e}/:id/service/ports/:port`
 
 /**
  * Store routes and their controllers for direct invocation
- * as serverless functions
+ *
  * @extends {Map}
  */
 class RouteMap extends Map {
@@ -138,7 +138,7 @@ function makeRoutes () {
   router.autoRoutes(endpoint, 'get', liveUpdate, http)
   router.autoRoutes(endpoint, 'get', getModels, http)
   router.autoRoutes(endpoint, 'post', postModels, http)
-  router.autoRoutes(endpointId, 'get', getModelsById, http)
+  router.autoRoutes(endpointId, 'get', getModelById, http)
   router.autoRoutes(endpointId, 'patch', patchModels, http)
   router.autoRoutes(endpointId, 'delete', deleteModels, http)
   router.autoRoutes(endpointCmd, 'patch', patchModels, http)
@@ -162,8 +162,8 @@ function makeRoutes () {
  *
  * @param {string} path
  * @param {'get'|'patch'|'post'|'delete'} method
- * @param {Request} req
- * @param {Response} res
+ * @param {ClientRequest} req
+ * @param {ServerResponse} res
  * @returns
  */
 async function handle (path, method, req, res) {
@@ -266,4 +266,3 @@ process.on('uncaughtException', error => {
   console.error('uncaughtException', error)
   broker.notify('uncaughtException', error)
 })
-