add support for registering new repo remotely

Author: tysonrm

src/adapters/controllers/index.js

@@ -12,7 +12,8 @@ const {
   removeModels,
   hotReload,
   registerEvents,
-  invokePorts
+  invokePorts,
+  deployModel
 } = UseCases
 
 import postModelFactory from './post-model'
@@ -23,6 +24,7 @@ import deleteModelFactory from './delete-model'
 import getConfigFactory from './get-config'
 import anyInvokePortFactory from './post-invoke-port'
 import makeLiveUpdate from './live-update'
+import makeLiveRollout from './live-rollout'
 
 function make (useCases, controllerFactory) {
   return useCases().map(uc => ({
@@ -42,6 +44,7 @@ export const anyInvokePorts = () => make(invokePorts, anyInvokePortFactory)
 export const liveUpdate = () => make(hotReload, makeLiveUpdate)
 export const getConfig = () => getConfigFactory(listConfigs())
 export const getRoutes = () => getUserRoutes()
+export const postEntry = () => makeLiveRollout(deployModel())
 
 export const initCache = () => {
   const label = '\ntime to load cache'

src/adapters/controllers/live-rollout.js

@@ -6,12 +6,12 @@
  * @param {function():string} hash
  * @returns {import("./http-adapter").httpController}
  */
-export default function makeLiveRollout (hotDeploy) {
+export default function makeLiveRollout (deployModel) {
   return async function liveRollout (httpRequest) {
     try {
       httpRequest.log(liveRollout.name)
 
-      const result = await hotDeploy(httpRequest.query.remoteEntry)
+      const result = await deployModel(httpRequest.body)
 
       console.debug({ fn: liveRollout.name, result })
       return {

src/adapters/webassembly/wasm-wrap.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const exports = require('webpack')
 const { WasmInterop } = require('./wasm-interop')
 
 /**@typedef {import("../../domain").ModelSpecification} ModelSpecification */

src/aegis.js

@@ -25,6 +25,7 @@ const {
   patchModels,
   postModels,
   liveUpdate,
+  postEntry,
   anyInvokePorts
 } = adapters.controllers
 
@@ -124,8 +125,8 @@ const router = {
     }
   },
 
-  adminRoute (controller, adapter) {
-    const adminPath = `${apiRoot}/config`
+  adminRoute (controller, adapter, path) {
+    const adminPath = `${apiRoot}/${path}`
     routes.set(adminPath, { get: adapter(controller()) })
   }
 }
@@ -146,7 +147,8 @@ function makeRoutes () {
   router.autoRoutes(endpointPortId, 'patch', anyInvokePorts, http, true)
   router.autoRoutes(endpointPortId, 'delete', anyInvokePorts, http, true)
   router.autoRoutes(endpointPortId, 'get', anyInvokePorts, http, true)
-  router.adminRoute(getConfig, http)
+  router.adminRoute(getConfig, http, 'config')
+  router.adminRoute(postEntry, http, 'deploy')
   router.userRoutes(getRoutes)
   console.log(routes)
 }

src/domain/use-cases/deploy-model.js

@@ -1,62 +1,51 @@
 import { importRemoteCache } from '../index.js'
 import path from 'path'
+import { cmd } from '../util/cmd.js'
 
-const config = '' // require(path.join(process.cwd(), 'wepack.config.js'))
-const webpack = require('webpack')
-const fs = require('fs')
-
-//.const compiler = webpack(config)
-
-// `compiler.run()` doesn't support promises yet, only callbacks
-async function compile () {
-  // await new Promise((resolve, reject) => {
-  //   compiler.run((err, res) => {
-  //     if (err) {
-  //       return reject(err)
-  //     }
-  //     resolve(res)
-  //   })
-  // })
+//
+async function compileAndReload () {
+  cmd('yarn build && yarn reload')
 }
 
-export function makeRegisterRemote () {
-  /**
-   * Process new remote entry.
-   * @param {import('../../../webpack/remote-entries-type.js').remoteEntry} remoteEntry
-   */
-  return async function registerRemote (remoteEntry) {
-    if (!remoteEntry?.name) throw new Error('no remote entry provided')
+/**
+ * Process new remote entry.
+ * @param {import('../../../webpack/remote-entries-type.js').remoteEntry} remoteEntry
+ */
+async function registerRemote (remoteEntry) {
+  if (!remoteEntry?.name) throw new Error('no remote entry provided')
+
+  const newFile = remoteEntry.name.concat('.js')
 
-    const newFile = remoteEntry.name.concat('.js')
+  if (fs.existsSync(newFile))
+    console.log('overritting remote entry file' + newFile)
 
-    if (fs.existsSync(newFile))
-      throw new Error('remote entry file already exists' + newFile)
+  try {
+    const fileContents =
+      `const {importWebAssembly} = require('@module-federation/aegis').adapters.webassembly\n` +
+      `const ${remoteEntry.name} = [${JSON.stringify(remoteEntry, 2, null) +
+        `\nimportRemote() { return importWebAssembly(this) }`}]`
 
-    try {
-      fs.writeFileSync(
-        path.resolve(process.cwd(), 'webpack/remote-entries', newFile),
-        JSON.stringify(remoteEntry),
-        { encoding: 'utf-8' }
-      )
+    fs.writeFileSync(
+      path.resolve(process.cwd(), 'webpack/remote-entries', newFile),
+      fileContents
+    )
 
-      const indexFile = path.resolve(
-        process.cwd(),
-        'webpack/remote-entries',
-        'index.js'
-      )
+    const indexFile = path.resolve(
+      process.cwd(),
+      'webpack/remote-entries',
+      'index.js'
+    )
 
-      const remoteExports = fs.readFileSync(indexFile, { encoding: 'utf-8' })
+    const remoteExports = fs.readFileSync(indexFile)
 
-      fs.writeFileSync(
-        indexFile,
-        remoteExports.concat(`export * from './${newFile}'\n`),
-        { encoding: 'utf-8' }
-      )
+    fs.writeFileSync(
+      indexFile,
+      remoteExports.concat(`\nexport  from './${newFile}'`)
+    )
 
-      await compile()
-    } catch (error) {
-      console.error({ fn: registerRemote.name, error })
-    }
+    await compileAndReload()
+  } catch (error) {
+    console.error({ fn: registerRemote.name, error })
   }
 }
 
@@ -65,7 +54,7 @@ export function makeRegisterRemote () {
  * @param {{models:import('../model-factory.js').ModelFactory}} param0
  * @returns
  */
-export default function makeDeployModel ({ models }) {
+export default function makeDeployModel () {
   /**
    * Handle deployment request.
    *
@@ -75,15 +64,15 @@ export default function makeDeployModel ({ models }) {
    *
    * @param {*} modelName
    */
-  return function deployModel (modelName) {
-    if (!modelName) throw new Error('missing modelName')
-    const modelNameUpper = modelName.toUpperCase()
+  return async function deployModel (input) {
+    console.log(input)
+    await registerRemote(input)
 
-    if (models.getModelSpec(modelNameUpper)) return
+    // if (models.getModelSpec(modelNameUpper)) return
 
-    importRemoteCache(modelNameUpper)
+    // importRemoteCache(modelNameUpper)
 
-    if (!models.getModelSpec(modelNameUpper))
-      throw new Error('model could not be loaded')
+    // if (!models.getModelSpec(modelNameUpper))
+    // throw new Error('model could not be loaded')
   }
 }

src/domain/use-cases/hot-reload.js

@@ -52,7 +52,7 @@ export default function makeHotReload ({ models, broker } = {}) {
 
   /**
    */
-  async function hotReload (modelName) {
+  async function hotReload (remoteEntry) {
     if (inProgress) {
       return { status: 'reload already in progress' }
     }

src/domain/use-cases/index.js

@@ -192,7 +192,6 @@ const findModels = () => make(makeFindModel)
 const removeModels = () => make(makeRemoveModel)
 const loadModels = () => make(makeLoadModels)
 const emitEvents = () => make(makeEmitEvent)
-const deployModels = () => make(makeDeployModel)
 const invokePorts = () => make(makeInvokePort)
 const hotReload = () => [
   {
@@ -203,6 +202,8 @@ const hotReload = () => [
     })
   }
 ]
+const deployModel = () => makeDeployModel()
+
 const listConfigs = () =>
   makeListConfig({
     models: ModelFactory,
@@ -283,7 +284,7 @@ export const UseCases = {
   hotReload,
   registerEvents,
   emitEvents,
-  deployModels,
+  deployModel,
   invokePorts
 }
 
@@ -306,7 +307,6 @@ export function UseCaseService (modelName) {
       removeModel: makeOne(modelNameUpper, makeRemoveModel),
       loadModels: makeOne(modelNameUpper, makeLoadModels),
       emitEvent: makeOne(modelNameUpper, makeEmitEvent),
-      deployModel: makeOne(modelNameUpper, makeDeployModel),
       invokePort: makeOne(modelNameUpper, makeInvokePort),
       listConfigs: listConfigs()
     }

src/domain/util/cmd.js

@@ -0,0 +1,15 @@
+const { exec } = require('child_process')
+
+exports.cmd = function (cmd) {
+  exec(cmd, (error, stdout, stderr) => {
+    if (error) {
+      console.log(`error: ${error.message}`)
+      return
+    }
+    if (stderr) {
+      console.log(`stderr: ${stderr}`)
+      return
+    }
+    console.log(`stdout: ${stdout}`)
+  })
+}

start.sh

@@ -15,7 +15,12 @@
 # export FORKRUN_ARG=../aegis-app/repo.js
 
 # ./forkrun
+cd ../aegis-app
+nohup node repo.js &
 
+nohup node repo.js 8001 cache &
+
+cp ../aegis/wasm/build/release.wasm ../aegis-app/dist/main.wasm
 yarn link
 cd ../aegis-host
 yarn link @module-federation/aegis