pear-mobile 0.0.1-rc → 0.0.2

package/README.md

@@ -15,18 +15,25 @@ Requires `react-native-bare-kit` to be listed in project dependencies.
 ## Usage
 
 ```js
+/* React Native */
 import PearRuntime from 'pear-mobile'
 import bundle from './worker.bundle.js'
 import { version, upgrade } from './package.json'
 
-const runtime = new PearRuntime({ version, upgrade })
-runtime.on('updated', () => {
-    runtime.applyUpdate()
-})
+const runtime = new PearRuntime()
+const IPC = runtime.run('/worker.bundle', bundle, [runtime.dir])
+
+/* Bare Worklet */
+const PearRuntime = require('pear-runtime')
+const { version, upgrade } = require('./package.json')
 
-const appStorage = runtime.storage
+const dir = Bare.argv[0]
 
-const IPC = runtime.run('/worker.bundle', bundle, [appStorage])
+const runtime = new PearRuntime({ version, upgrade, dir })
+runtime.on('updated', () => {
+  runtime.applyUpdate()
+  conosle.log('restart for update')
+})
 ```
 
 ## API
@@ -51,11 +58,12 @@ Unsubscribe: remove `callback` for `event`, or remove all listeners for `event`
 
 Subscribe to an event once; listener is removed after the first emit. Returns `runtime`.
 
-#### `IPC = runtime.run(filename, bundle, argv)`
+#### `const IPC <stream.Duplex> = runtime.run(filename, bundle, argv)`
 
 Start a bare worker (worklet). Returns an IPC duplex stream. `filename` is a virtual path, `bundle` is the worklet bundle, `argv` is an array of string arguments.
 
 `Bare.argv` in worker to access `argv`.
+`Bare.IPC` in worker to access stream.
 
 #### `runtime.ready()`
 

package/index.js

@@ -1,109 +1,16 @@
-const { Worklet } = require('react-native-bare-kit') // NEED TO INSTALL IN ROOT PRJECT (version match)
-const bundle = require('./lib/pear.bundle.js')
-const RPC = require('bare-rpc')
-const RNFS = require('react-native-fs')
-const AsyncStorage = require('@react-native-async-storage/async-storage') // NEED TO INSTALL IN ROOT PRJECT (version match)
-const { DevSettings } = require('react-native') // NEED TO INSTALL IN ROOT PRJECT (version match)
-const b4a = require('b4a')
-
-module.exports = class PearRuntime {
-  constructor(config = {}) {
-    if (!config.upgrade) throw new Error('upgrade link required')
-    this.config = {
-      dir: `${RNFS.DocumentDirectoryPath}/pear-runtime`,
-      isDev: __DEV__,
-      ...config
+const PearRuntimeUpdater = require('pear-runtime-updater')
+const path = require('bare-path')
+const fs = require('bare-fs')
+
+module.exports = class PearRuntime extends PearRuntimeUpdater {
+  constructor(opts = {}) {
+    const appPath = opts.app || path.join(opts.dir, 'pear-runtime/upgrade')
+    if (!fs.existsSync(appPath)) fs.mkdirSync(appPath, { recursive: true, force: true })
+    if (fs.existsSync(path.join(appPath, 'package.json'))) {
+      const manifest = fs.readFileSync(path.join(appPath, 'package.json'))
+      opts.version = JSON.parse(manifest).version
     }
-
-    this._listeners = Object.create(null)
-    this._calledReady = null
-
-    this.IPCPromise = this.ready().catch(noop)
-  }
-
-  ready() {
-    if (this._calledReady) return this._calledReady
-    this._calledReady = this._open()
-    return this._calledReady
-  }
-
-  async _open() {
-    const runtimeDir = `${RNFS.DocumentDirectoryPath}/pear-runtime`
-    const storageDir = `${runtimeDir}/storage`
-
-    await RNFS.mkdir(runtimeDir)
-    await RNFS.mkdir(storageDir)
-
-    const argv = [JSON.stringify(this.config)]
-    const worklet = new Worklet()
-    worklet.start('/pear.bundle', bundle, argv)
-
-    return new RPC(worklet.IPC, async (req) => {
-      if (req.command === 0) {
-        const version = b4a.toString(req.data)
-        console.log('received version form pearend:', version)
-        this.emit('updated')
-      }
-      if (req.command === 1){
-        const updateData = b4a.toString(req.data)
-        console.log('[Update Diff]', updateData)
-      }
-      if (req.command === 2){
-        const logString = b4a.toString(req.data)
-        console.log('[pear-runtime]:', logString)
-      }
-    })
-  }
-
-  async applyUpdate(version) {
-    await AsyncStorage.multiSet([
-      ['updatePending', 'true'],
-      ['updateConfirmed', 'false'],
-      ['runtimeVersion', String(version ?? this.version)]
-    ])
-
-    DevSettings.reload()
-  }
-
-  async close() {}
-
-  on(event, callback) {
-    if (!this._listeners[event]) this._listeners[event] = []
-    this._listeners[event].push(callback)
-    return this
-  }
-
-  off(event, callback) {
-    if (!this._listeners[event]) return this
-    if (callback) {
-      this._listeners[event] =
-        this._listeners[event].filter(fn => fn !== callback)
-    } else {
-      this._listeners[event] = []
-    }
-    return this
-  }
-
-  once(event, fn) {
-    const wrap = (...args) => {
-      this.off(event, wrap)
-      fn(...args)
-    }
-    return this.on(event, wrap)
-  }
-
-  emit(event, ...args) {
-    const list = this._listeners[event]
-    if (!list) return this
-    for (const fn of list) fn(...args)
-    return this
-  }
-
-  run(filename, bundle, argv) {
-    const worklet = new Worklet()
-    worklet.start(filename, bundle, argv)
-    return worklet.IPC
+    opts = { app: appPath, ...opts }
+    super(opts)
   }
 }
-
-function noop() {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pear-mobile",
-  "version": "0.0.1-rc",
+  "version": "0.0.2",
   "description": "Embeddable Pear runtime for mobile applications",
   "main": "index.js",
   "exports": {
@@ -14,10 +14,9 @@
     "package.json",
     "index.js",
     "index.d.ts",
-    "lib/pear.bundle.js"
+    "index.rn.js"
   ],
   "scripts": {
-    "build": "npx bare-pack --host ios --host android --linked --out ./lib/pear.bundle.js ./lib/pear.js",
     "format": "prettier . --write",
     "test": "prettier . --check && lunte && brittle-bare test/index.js",
     "lint": "lunte"
@@ -36,27 +35,11 @@
     "brittle": "^3.19.0",
     "lunte": "^1.2.0",
     "prettier": "^3.6.2",
-    "prettier-config-holepunch": "^2.0.0",
-    "hyperdrive": "^13.2.1",
-    "hyperswarm": "^4.16.0",
-    "localdrive": "^2.2.0",
-    "pear-link": "^4.2.1",
-    "bare-bundle-id": "^1.0.2",
-    "bare-module-traverse": "^2.0.1",
-    "bare-pack": "^2.0.0",
-    "bare-path": "^3.0.0",
-    "corestore": "^7.8.0",
-    "hypercore-id-encoding": "^1.3.0",
-    "ready-resource": "^1.2.0"
+    "prettier-config-holepunch": "^2.0.0"
   },
   "dependencies": {
-    "b4a": "^1.7.4",
-    "bare-rpc": "^1.1.0",
-    "react-native-fs": "^2.20.0"
-  },
-  "peerDependencies": {
-    "react-native-bare-kit": "*",
-    "@react-native-async-storage/async-storage": "*",
-    "react-native": "*"
+    "bare-fs": "^4.5.4",
+    "bare-path": "^3.0.0",
+    "pear-runtime-updater": "^0.0.10"
   }
 }