Merge pull request #3 from eyra/locale-and-exit

Added locale parameter and support for CommandSystemExit

src/fake_bridge.ts

@@ -0,0 +1,22 @@
+import { CommandSystem, CommandSystemDonate, CommandSystemExit, isCommandSystemDonate, isCommandSystemExit } from './framework/types/commands'
+import { Bridge } from './framework/types/modules'
+
+export default class FakeBridge implements Bridge {
+  send (command: CommandSystem): void {
+    if (isCommandSystemDonate(command)) {
+      this.handleDonation(command)
+    } else if (isCommandSystemExit(command)) {
+      this.handleExit(command)
+    } else {
+      console.log('[FakeBridge] received unknown command: ' + JSON.stringify(command))
+    }
+  }
+
+  handleDonation (command: CommandSystemDonate): void {
+    console.log(`[FakeBridge] received donation: ${command.key}=${command.json_string}`)
+  }
+
+  handleExit (command: CommandSystemExit): void {
+    console.log(`[FakeBridge] received exit: ${command.code}=${command.info}`)
+  }
+}

src/framework/assembly.ts

@@ -1,18 +1,18 @@
 import ReactEngine from './visualisation/react/engine'
 import ReactFactory from './visualisation/react/factory'
 import WorkerProcessingEngine from './processing/worker_engine'
-import { VisualisationEngine, ProcessingEngine, Storage } from './types/modules'
+import { VisualisationEngine, ProcessingEngine, Bridge } from './types/modules'
 import CommandRouter from './command_router'
 
 export default class Assembly {
   visualisationEngine: VisualisationEngine
   processingEngine: ProcessingEngine
   router: CommandRouter
 
-  constructor (worker: Worker, system: Storage) {
+  constructor (worker: Worker, bridge: Bridge) {
     const sessionId = String(Date.now())
     this.visualisationEngine = new ReactEngine(new ReactFactory())
-    this.router = new CommandRouter(system, this.visualisationEngine)
+    this.router = new CommandRouter(bridge, this.visualisationEngine)
     this.processingEngine = new WorkerProcessingEngine(sessionId, worker, this.router)
   }
 }

src/framework/command_router.ts

@@ -1,12 +1,12 @@
 import { Command, Response, isCommandSystem, isCommandUI, CommandUI, CommandSystem } from './types/commands'
-import { CommandHandler, Storage, VisualisationEngine } from './types/modules'
+import { CommandHandler, Bridge, VisualisationEngine } from './types/modules'
 
 export default class CommandRouter implements CommandHandler {
-  system: Storage
+  bridge: Bridge
   visualisationEngine: VisualisationEngine
 
-  constructor (system: Storage, visualisationEngine: VisualisationEngine) {
-    this.system = system
+  constructor (bridge: Bridge, visualisationEngine: VisualisationEngine) {
+    this.bridge = bridge
     this.visualisationEngine = visualisationEngine
   }
 
@@ -23,7 +23,7 @@ export default class CommandRouter implements CommandHandler {
   }
 
   onCommandSystem (command: CommandSystem, resolve: (response: Response) => void): void {
-    this.system.send(command)
+    this.bridge.send(command)
     resolve({ __type__: 'Response', command, payload: { __type__: 'PayloadVoid', value: undefined } })
   }
 

src/framework/processing/py/port/api/commands.py

@@ -24,3 +24,18 @@ def toDict(self):
         dict["key"] = self.key
         dict["json_string"] = self.json_string
         return dict
+
+
+class CommandSystemExit:
+    __slots__ = "code", "info"
+
+    def __init__(self, code, info):
+        self.code = code
+        self.info = info
+
+    def toDict(self):
+        dict = {}
+        dict["__type__"] = "CommandSystemExit"
+        dict["code"] = self.code
+        dict["info"] = self.info
+        return dict

src/framework/processing/py/port/script.py

@@ -1,5 +1,5 @@
 import port.api.props as props
-from port.api.commands import (CommandSystemDonate, CommandUIRender)
+from port.api.commands import (CommandSystemDonate, CommandSystemExit, CommandUIRender)
 
 import pandas as pd
 import zipfile
@@ -58,6 +58,7 @@ def process(sessionId):
                 meta_data.append(("debug", f"{platform}: donate consent data"))
                 yield donate(f"{sessionId}-{platform}", consent_result.value)
 
+    yield exit(0, "Success")
     yield render_end_page()
 
 
@@ -141,3 +142,6 @@ def prompt_consent(id, data, meta_data):
 
 def donate(key, json_string):
     return CommandSystemDonate(key, json_string)
+
+def exit(code, info):
+    return CommandSystemExit(code, info)

src/framework/types/commands.ts

@@ -82,12 +82,22 @@ export function isCommand (arg: any): arg is Command {
 }
 
 export type CommandSystem =
-  CommandSystemDonate
+  CommandSystemDonate |
+  CommandSystemExit
 
 export function isCommandSystem (arg: any): arg is CommandSystem {
   return isCommandSystemDonate(arg)
 }
 
+export interface CommandSystemExit {
+  __type__: 'CommandSystemExit'
+  code: number
+  info: string
+}
+export function isCommandSystemExit (arg: any): arg is CommandSystemExit {
+  return isInstanceOf<CommandSystemExit>(arg, 'CommandSystemExit', ['code', 'info'])
+}
+
 export type CommandUI =
   CommandUIRender
 

src/framework/types/modules.ts

@@ -12,7 +12,7 @@ export interface VisualisationEngine {
   terminate: () => void
 }
 
-export interface Storage {
+export interface Bridge {
   send: (command: CommandSystem) => void
 }
 

src/index.tsx

@@ -1,30 +1,29 @@
 import './fonts.css'
 import './framework/styles.css'
 import Assembly from './framework/assembly'
-import { Storage } from './framework/types/modules'
-import LiveStorage from './live_storage'
-import FakeStorage from './fake_storage'
+import { Bridge } from './framework/types/modules'
+import LiveBridge from './live_bridge'
+import FakeBridge from './fake_bridge'
 
 const rootElement = document.getElementById('root') as HTMLElement
 
-const locale = 'en'
 const workerFile = new URL('./framework/processing/py_worker.js', import.meta.url)
 const worker = new Worker(workerFile)
 
 let assembly: Assembly
 
-const run = (system: Storage): void => {
-  assembly = new Assembly(worker, system)
+const run = (bridge: Bridge, locale: string): void => {
+  assembly = new Assembly(worker, bridge)
   assembly.visualisationEngine.start(rootElement, locale)
   assembly.processingEngine.start()
 }
 
-if (process.env.REACT_APP_BUILD!=='standalone' && process.env.NODE_ENV === 'production') {
+if (process.env.REACT_APP_BUILD !== 'standalone' && process.env.NODE_ENV === 'production') {
   // Setup embedded mode (requires to be embedded in iFrame)
-  console.log('Initializing storage system')
-  LiveStorage.create(window, run)
+  console.log('Initializing bridge system')
+  LiveBridge.create(window, run)
 } else {
   // Setup local development mode
-  console.log('Running with fake storage')
-  run(new FakeStorage())
+  console.log('Running with fake bridge')
+  run(new FakeBridge(), 'en')
 }

src/live_bridge.ts

@@ -0,0 +1,36 @@
+import { CommandSystem, isCommandSystem } from './framework/types/commands'
+import { Bridge } from './framework/types/modules'
+
+export default class LiveBridge implements Bridge {
+  port: MessagePort
+
+  constructor (port: MessagePort) {
+    this.port = port
+  }
+
+  static create (window: Window, callback: (bridge: Bridge, locale: string) => void): void {
+    window.addEventListener('message', (event) => {
+      console.log('MESSAGE RECEIVED', event)
+      // Skip webpack messages
+      if (event.data.action === 'live-init') {
+        const bridge = new LiveBridge(event.ports[0])
+        const locale = event.data.locale
+        console.log('LOCALE', locale)
+        callback(bridge, locale)
+      }
+    })
+  }
+
+  send (command: CommandSystem): void {
+    if (isCommandSystem(command)) {
+      this.port.postMessage(command)
+    } else {
+      this.log('error', 'received unknown command', command)
+    }
+  }
+
+  private log (level: 'info' | 'error', ...message: any[]): void {
+    const logger = level === 'info' ? console.log : console.error
+    logger(`[${this.constructor.name}]`, ...message)
+  }
+}