pear-mobile 0.1.0-rc → 1.0.0-rc

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 })
+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 dir = Bare.argv[0]
+
+const runtime = new PearRuntime({version, upgrade, dir})
 runtime.on('updated', () => {
     runtime.applyUpdate()
+    conosle.log('restart for update')
 })
-
-const appStorage = runtime.storage
-
-const IPC = runtime.run('/worker.bundle', bundle, [appStorage])
 ```
 
 ## API

package/index.js

@@ -1,109 +1,126 @@
-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
-    }
-
-    this._listeners = Object.create(null)
-    this._calledReady = null
-
-    this.IPCPromise = this.ready().catch(noop)
+/* global BareKit */
+
+const Hyperswarm = require('hyperswarm')
+const Hyperdrive = require('hyperdrive')
+const Corestore = require('corestore')
+const path = require('bare-path')
+const fs = require('bare-fs')
+const fsx = require('fs-native-extensions')
+const ReadyResource = require('ready-resource')
+const plink = require('pear-link')
+const hid = require('hypercore-id-encoding')
+const Localdrive = require('localdrive')
+const { isIOS } = require('which-runtime')
+
+module.exports = class PearRuntime extends ReadyResource {
+  constructor(config) {
+    super()
+    if (!config.dir) throw new Error('PearRuntime needs "dir" to /Documents Sandbox')
+    const { drive: upgrade } = plink.parse(config.upgrade)
+    this.dir = config.dir
+    this.version = config.version || 0
+    this.app = path.join(this.dir, 'pear-runtime/upgrade', isIOS ? 'runtime.ios.bundle' : 'runtime.android.bundle')
+    this.name = isIOS ? 'runtime.ios.bundle' : 'runtime.android.bundle'
+    this.key = hid.decode(upgrade.key)
+    this.length = upgrade.length || 0
+    this.fork = upgrade.fork || 0
+    this.link = plink.serialize({ drive: { fork: this.fork, length: this.length, key: this.key }})
+    this.store = config.store || new Corestore(path.join(this.dir, 'pear-runtime/corestore'))
+    this.drive = new Hyperdrive(this.store, this.key)
+    this.swarm = config.swarm || null
+    this.next = null
+    this.checkout = null
+
+    this.updating = false
+    this.updated = false
+
+    this.ready().catch(noop)
   }
 
-  ready() {
-    if (this._calledReady) return this._calledReady
-    this._calledReady = this._open()
-    return this._calledReady
+  async _open() {
+    await this.drive.ready()
+    await fs.rm(path.join(this.dir, 'pear-runtime/next'), {
+        recursive: true,
+        force: true
+      })
+    await fs.mkdir(path.join(this.dir, 'pear-runtime/next'), { recursive: true, force: true })
+    if (!this.swarm) {
+      const keyPair = await this.store.createKeyPair('pear-container')
+      this.swarm = new Hyperswarm({ keyPair })
+    }
+    
+    this.swarm.on('connection', (connection) => this.store.replicate(connection))
+    this.swarm.join(this.drive.core.discoveryKey, { client: true, server: false })
+    
+    this._updateBackground()
+    this.drive.core.on('append', () => this._updateBackground())
   }
 
-  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 _close() {
+    await this.drive.close()
+    if (this.checkout) await this.checkout.close()
+    await this.store.destroy()
+    await this.swarm.destroy()
   }
 
-  async applyUpdate(version) {
-    await AsyncStorage.multiSet([
-      ['updatePending', 'true'],
-      ['updateConfirmed', 'false'],
-      ['runtimeVersion', String(version ?? this.version)]
-    ])
+  async applyUpdate() {
+    // we apply the update the same way bc react-native will always try to boot (e.g) upgrade/runtime.ios.bundle first
+    if (!this.updated || this.applied || !this.dir) return
+    this.applied = true
+    if (!await fs.exists(this.app)) {
+      await fs.mkdir(path.join(this.dir, 'pear-runtime/upgrade'), { recursive: true, force: true })
+      await fs.writeFile(this.app, '')
+    }
 
-    DevSettings.reload()
+    await fsx.swap(path.join(this.next, this.name), this.app)
+    await fs.promises.rm(this.next, { recursive: true, force: true })
   }
 
-  async close() {}
-
-  on(event, callback) {
-    if (!this._listeners[event]) this._listeners[event] = []
-    this._listeners[event].push(callback)
-    return this
+  _updateBackground() {
+    this._update().catch(noop)
   }
 
-  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] = []
+  async _update() {
+    if (this.updating) return
+    this.updating = true
+
+    const length = this.drive.core.length
+    const id = length + '.' + this.drive.core.fork
+    const next = path.join(this.dir, 'pear-runtime/next', id)
+    const co = this.drive.checkout(length)
+
+    this.checkout = co
+
+    const manifest = await co.get('/package.json')
+    const version = manifest && JSON.parse(manifest).version
+    if (!manifest || version === this.version) {
+      this.updating = false
+      this.checkout = null
+      await co.close()
+      return
     }
-    return this
-  }
 
-  once(event, fn) {
-    const wrap = (...args) => {
-      this.off(event, wrap)
-      fn(...args)
+    const local = new Localdrive(next)
+
+    this.emit('updating')
+
+    for await (const data of co.mirror(local)) {
+      this.emit('updating-delta', data)
     }
-    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
-  }
+    await co.close()
+    await local.close()
+
+    this.checkout = null
+    this.length = length
+    this.next = next
+
+    this.updating = false
+    this.updated = true
+    this.emit('updated', version)
 
-  run(filename, bundle, argv) {
-    const worklet = new Worklet()
-    worklet.start(filename, bundle, argv)
-    return worklet.IPC
+    if (this.drive.core.length > length) this._updateBackground()
   }
 }
 
-function noop() {}
+function noop() {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pear-mobile",
-  "version": "0.1.0-rc",
+  "version": "1.0.0-rc",
   "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,21 @@
     "brittle": "^3.19.0",
     "lunte": "^1.2.0",
     "prettier": "^3.6.2",
-    "prettier-config-holepunch": "^2.0.0",
+    "prettier-config-holepunch": "^2.0.0"
+  },
+  "dependencies": {
+    "bare-path": "^3.0.0",
+    "corestore": "^7.8.0",
+    "fs-native-extensions": "^1.4.5",
+    "hypercore-id-encoding": "^1.3.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"
-  },
-  "dependencies": {
-    "b4a": "^1.7.4",
-    "bare-rpc": "^1.1.0",
-    "react-native-fs": "^2.20.0"
+    "ready-resource": "^1.2.0",
+    "which-runtime": "^1.3.2"
   },
   "peerDependencies": {
-    "react-native-bare-kit": "*",
-    "@react-native-async-storage/async-storage": "*",
-    "react-native": "*"
+    "react-native-bare-kit": "*"
   }
 }