pear-electron 0.1.0 → 0.2.0

package/gui/gui.js

@@ -806,7 +806,8 @@ class GuiCtrl {
     this.parentId = parentId
     this.closed = true
     this.id = null
-    this.bridge = this.state.runtimeInfo?.bridge ?? null
+    this.runtimeInfo = this.state.runtimeInfo
+    this.bridge = this.runtimeInfo?.bridge ?? null
     this.entry = this.bridge === null ? entry : `${this.bridge}${entry}`
     this.sessname = sessname
     this.appkin = appkin
@@ -1019,7 +1020,7 @@ class Window extends GuiCtrl {
         preload: require.main.filename,
         ...(decal === false ? { session } : {}),
         partition: 'persist:pear',
-        additionalArguments: [JSON.stringify({ ...this.state.config, isDecal: true })],
+        additionalArguments: [JSON.stringify({ ...this.state.config, runtimeInfo: this.runtimeInfo, isDecal: true })],
         autoHideMenuBar: true,
         experimentalFeatures: true,
         nodeIntegration: true,
@@ -1118,7 +1119,7 @@ class Window extends GuiCtrl {
       webPreferences: {
         preload: require.main.filename,
         session,
-        additionalArguments: [JSON.stringify({ ...this.state.config, parentWcId: this.win.webContents.id, decalled: true })],
+        additionalArguments: [JSON.stringify({ ...this.state.config, runtimeInfo: this.runtimeInfo, parentWcId: this.win.webContents.id, decalled: true })],
         autoHideMenuBar: true,
         experimentalFeatures: true,
         nodeIntegration: true,
@@ -1321,7 +1322,7 @@ class View extends GuiCtrl {
       webPreferences: {
         preload: require.main.filename,
         session,
-        additionalArguments: [JSON.stringify({ ...this.state.config, ...(options?.view?.config || options.config || {}), parentWcId: this.win.webContents.id })],
+        additionalArguments: [JSON.stringify({ ...this.state.config, ...(options?.view?.config || options.config || {}), runtimeInfo: this.runtimeInfo, parentWcId: this.win.webContents.id })],
         autoHideMenuBar: true,
         experimentalFeatures: true,
         nodeIntegration: true,
@@ -1515,6 +1516,8 @@ class PearGUI extends ReadyResource {
     electron.ipcMain.handle('checkpoint', (evt, ...args) => this.checkpoint(...args))
     electron.ipcMain.handle('versions', (evt, ...args) => this.versions(...args))
     electron.ipcMain.handle('restart', (evt, ...args) => this.restart(...args))
+    electron.ipcMain.handle('get', (evt, ...args) => this.get(...args))
+    electron.ipcMain.handle('exists', (evt, ...args) => this.exists(...args))
 
     electron.ipcMain.on('workerRun', (evt, link, args) => {
       const pipe = this.worker.run(link, args)
@@ -1609,9 +1612,9 @@ class PearGUI extends ReadyResource {
     win.loadURL('chrome://' + name)
   }
 
-  has (id) { return GuiCtrl[kMap].has(id) }
+  hasCtrl (id) { return GuiCtrl[kMap].has(id) }
 
-  get (id) {
+  getCtrl (id) {
     const instance = GuiCtrl[kMap].get(id)
     if (!instance) {
       return {
@@ -1665,7 +1668,7 @@ class PearGUI extends ReadyResource {
   }
 
   async parent ({ id, act, args }) {
-    const instance = this.get(id)
+    const instance = this.getCtrl(id)
     if (!instance) throw new Error(`Could not find parent with id "${id}" to perform action "${act}"!`)
     if (act === 'focus') return instance.focus(...args)
     if (act === 'blur') return instance.blur()
@@ -1679,69 +1682,69 @@ class PearGUI extends ReadyResource {
     if (act === 'isFullscreen') return instance.isFullscreen()
   }
 
-  open ({ id, options }) { return this.get(id).open(options) }
+  open ({ id, options }) { return this.getCtrl(id).open(options) }
 
   // guiClose because ReadyResource needs close (affects internal naming only)
-  guiClose ({ id }) { return this.get(id).close() }
+  guiClose ({ id }) { return this.getCtrl(id).close() }
 
-  show ({ id }) { return this.get(id).show() }
+  show ({ id }) { return this.getCtrl(id).show() }
 
-  hide ({ id }) { return this.get(id).hide() }
+  hide ({ id }) { return this.getCtrl(id).hide() }
 
-  minimize ({ id }) { return this.get(id).minimize() }
+  minimize ({ id }) { return this.getCtrl(id).minimize() }
 
-  maximize ({ id }) { return this.get(id).maximize() }
+  maximize ({ id }) { return this.getCtrl(id).maximize() }
 
-  setMinimizable ({ id, value }) { return this.get(id).setMinimizable(value) }
+  setMinimizable ({ id, value }) { return this.getCtrl(id).setMinimizable(value) }
 
-  setMaximizable ({ id, value }) { return this.get(id).setMaximizable(value) }
+  setMaximizable ({ id, value }) { return this.getCtrl(id).setMaximizable(value) }
 
-  fullscreen ({ id }) { return this.get(id).fullscreen() }
+  fullscreen ({ id }) { return this.getCtrl(id).fullscreen() }
 
-  restore ({ id }) { return this.get(id).restore() }
+  restore ({ id }) { return this.getCtrl(id).restore() }
 
-  focus ({ id, options }) { return this.get(id).focus(options) }
+  focus ({ id, options }) { return this.getCtrl(id).focus(options) }
 
-  blur ({ id }) { return this.get(id).blur() }
+  blur ({ id }) { return this.getCtrl(id).blur() }
 
-  dimensions ({ id, options }) { return this.get(id).dimensions(options) }
+  dimensions ({ id, options }) { return this.getCtrl(id).dimensions(options) }
 
-  isVisible ({ id }) { return this.get(id).isVisible() }
+  isVisible ({ id }) { return this.getCtrl(id).isVisible() }
 
-  isClosed ({ id }) { return (this.has(id)) ? this.get(id).isClosed() : true }
+  isClosed ({ id }) { return (this.hasCtrl(id)) ? this.getCtrl(id).isClosed() : true }
 
-  isMinimized ({ id }) { return this.get(id).isMinimized() }
+  isMinimized ({ id }) { return this.getCtrl(id).isMinimized() }
 
-  isMaximized ({ id }) { return this.get(id).isMaximized() }
+  isMaximized ({ id }) { return this.getCtrl(id).isMaximized() }
 
-  isFullscreen ({ id }) { return this.get(id).isFullscreen() }
+  isFullscreen ({ id }) { return this.getCtrl(id).isFullscreen() }
 
-  setSize ({ id, width, height }) { return this.get(id).setSize(width, height) }
+  setSize ({ id, width, height }) { return this.getCtrl(id).setSize(width, height) }
 
-  unloading ({ id }) { return this.get(id).unloading() }
+  unloading ({ id }) { return this.getCtrl(id).unloading() }
 
   async completeUnload ({ id, action }) {
-    const instance = this.get(id)
+    const instance = this.getCtrl(id)
     if (!instance) return
     instance.completeUnload(action)
   }
 
-  async attachMainView ({ id }) { this.get(id).attachMainView() }
+  async attachMainView ({ id }) { this.getCtrl(id).attachMainView() }
 
-  async detachMainView ({ id }) { this.get(id).detachMainView() }
+  async detachMainView ({ id }) { this.getCtrl(id).detachMainView() }
 
   async afterViewLoaded ({ id }) {
-    return this.get(id).afterViewLoaded()
+    return this.getCtrl(id).afterViewLoaded()
   }
 
   async setWindowButtonPosition ({ id, point }) {
-    const instance = this.get(id)
+    const instance = this.getCtrl(id)
     if (!instance) return
     instance.setWindowButtonPosition(point)
   }
 
   async setWindowButtonVisibility ({ id, visible }) {
-    const instance = this.get(id)
+    const instance = this.getCtrl(id)
     if (!instance) return
     instance.setWindowButtonVisibility(visible)
   }

package/gui/preload.js

@@ -226,6 +226,10 @@ module.exports = class PearGUI {
             return stream
           }
 
+          async get (key) {
+            return Buffer.from(await ipc.get(key)).toString('utf-8')
+          }
+
           constructor () {
             if (state.isDecal) {
               this[this.constructor.DECAL] = {
@@ -309,6 +313,8 @@ class IPC {
   checkpoint (...args) { return electron.ipcRenderer.invoke('checkpoint', ...args) }
   versions (...args) { return electron.ipcRenderer.invoke('versions', ...args) }
   restart (...args) { return electron.ipcRenderer.invoke('restart', ...args) }
+  get (...args) { return electron.ipcRenderer.invoke('get', ...args) }
+  exists (...args) { return electron.ipcRenderer.invoke('exists', ...args) }
 
   messages (pattern) {
     electron.ipcRenderer.send('messages', pattern)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pear-electron",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Pear User-Interface Library for Electron",
   "main": "index.js",
   "bin": "bin.js",
@@ -78,6 +78,7 @@
     "hyperswarm": "^4.8.4",
     "iambus": "^1.0.3",
     "localdrive": "^1.12.1",
+    "node-bare-bundle": "^1.4.2",
     "paparam": "^1.6.1",
     "path": "npm:bare-node-path@^1.0.1",
     "pear-api": "^0.0.17",

package/preload.js

@@ -19,6 +19,7 @@ module.exports = (state) => {
 
   const gui = new GUI({ API, state })
   window.Pear = gui.api
+  const PearElectron = Pear[Pear.constructor.UI]
 
   if (isDecal === false) Object.assign(process.env, env)
 
@@ -55,9 +56,11 @@ module.exports = (state) => {
     warn.call(console, msg, ...args)
   }
 
-  if (runtimeInfo.preload) {
-    gui.ipc.get(runtimeInfo.preload).then((preload) => {
-      eval(preload) // eslint-disable-line
+  if (Pear.config.options.gui?.preload) {
+    const run = require('node-bare-module')
+    const key = Pear.config.options.gui.preload
+    Pear.get({ key, bundle: true }).then((preload) => {
+      run(preload, { mount: '/', entrypoint: key })
     }, console.error).finally(descopeGlobals)
   } else {
     descopeGlobals()
@@ -181,19 +184,19 @@ module.exports = (state) => {
       this.#demax = () => this.root.querySelector('#ctrl').classList.remove('max')
     }
 
-    async #min () { await Pear.Window.self.minimize() }
+    async #min () { await PearElectron.Window.self.minimize() }
     async #max (e) {
-      if (isMac) await Pear.Window.self.fullscreen()
-      else await Pear.Window.self.maximize()
+      if (isMac) await PearElectron.Window.self.fullscreen()
+      else await PearElectron.Window.self.maximize()
       e.target.root.querySelector('#ctrl').classList.add('max')
     }
 
     async #restore (e) {
-      await Pear.Window.self.restore()
+      await PearElectron.Window.self.restore()
       e.target.root.querySelector('#ctrl').classList.remove('max')
     }
 
-    async #close () { await Pear.Window.self.close() }
+    async #close () { await PearElectron.Window.self.close() }
     #win () {
       return `
     <style>