pear-electron 0.0.4 → 0.1.1

package/boot.js

@@ -1,6 +1,13 @@
 /** @typedef {import('pear-interface')} */
 'use strict'
-const RUNTIME_INFO = JSON.parse(process.argv[process.argv.indexOf('--runtime-info') + 1])
+const { isElectron, isElectronRenderer, isElectronWorker, isWindows } = require('which-runtime')
+const BOOT_ELECTRON_MAIN = 1
+const BOOT_ELECTRON_PRELOAD = 2
+const rtix = process.argv.indexOf('--runtime-info')
+const rti = rtix > -1 && process.argv[rtix + 1]
+const state = rti ? null : JSON.parse(process.argv.slice(isWindows ? -2 : -1)[0])
+const RUNTIME_INFO = rti ? JSON.parse(rti) : state.runtimeInfo
+
 class API {
   static CHECKOUT = RUNTIME_INFO.checkout
   static MOUNT = RUNTIME_INFO.mount
@@ -8,16 +15,14 @@ class API {
   config = {}
 }
 global.Pear = new API()
-const { isElectron, isElectronRenderer, isElectronWorker } = require('which-runtime')
-const BOOT_ELECTRON_MAIN = 1
-const BOOT_ELECTRON_PRELOAD = 2
+
 switch (getBootType()) {
   case BOOT_ELECTRON_MAIN: {
     require('./electron-main.js')
     break
   }
   case BOOT_ELECTRON_PRELOAD: {
-    require('./preload.js')
+    require('./preload.js')(state)
     break
   }
 }

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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pear-electron",
-  "version": "0.0.4",
+  "version": "0.1.1",
   "description": "Pear User-Interface Library for Electron",
   "main": "index.js",
   "bin": "bin.js",

package/preload.js

@@ -2,14 +2,14 @@
 
 /* global Pear */
 /* eslint-env node, browser */
-if (process.isMainFrame) {
+module.exports = (state) => {
+  if (!process.isMainFrame) return
   const electron = require('electron')
   const timers = require('timers')
   const { isMac, isWindows, platform } = require('which-runtime')
   const API = require('pear-api')
   const GUI = require('./gui')
-  const state = JSON.parse(process.argv.slice(isWindows ? -2 : -1)[0])
-  const { parentWcId, env, id, ...config } = state
+  const { parentWcId, env, id, runtimeInfo, ...config } = state
   const isDecal = state.isDecal || false
   if (config.key?.type === 'Buffer') config.key = Buffer.from(config.key.data)
   const dir = config.dir
@@ -55,8 +55,8 @@ if (process.isMainFrame) {
     warn.call(console, msg, ...args)
   }
 
-  if (Pear.config.gui.preload) {
-    gui.ipc.get(Pear.config.gui.preload).then((preload) => {
+  if (runtimeInfo.preload) {
+    gui.ipc.get(runtimeInfo.preload).then((preload) => {
       eval(preload) // eslint-disable-line
     }, console.error).finally(descopeGlobals)
   } else {
@@ -302,12 +302,12 @@ if (process.isMainFrame) {
           svg {
             width: 1em;
             height: 1em;
-         }
-         #titlebar{
-           -webkit-app-region: drag;
-           width: 100%;
-           height: 50px;
-         }
+          }
+          #titlebar{
+            -webkit-app-region: drag;
+            width: 100%;
+            height: 50px;
+          }
         </style>
         <div id="titlebar">
           <div id="ctrl">

package/runtime.js

@@ -70,7 +70,7 @@ class PearElectron {
     const info = JSON.stringify({
       checkout: constants.CHECKOUT,
       mount: constants.MOUNT,
-      bridge: opts.bridge?.addr ?? undefined,
+      bridge: opts.bridge?.addr ?? undefined
     })
     argv = [BOOT, '--runtime-info', info, ...argv]
     const stdio = args.detach ? 'ignore' : ['ignore', 'inherit', 'pipe', 'pipe']