Skip to content

Commit

Permalink
inherit more from parent (#612)
Browse files Browse the repository at this point in the history
* inherit more from parent

* simplify
  • Loading branch information
mafintosh authored and chm-diederichs committed Dec 12, 2024
1 parent 14968f0 commit f19c966
Showing 1 changed file with 24 additions and 18 deletions.
42 changes: 24 additions & 18 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@ class Hypercore extends EventEmitter {

if (!storage) storage = opts.storage

this.core = opts.core || null
this.core = null
this.state = null
this.encryption = null
this.extensions = new Map()

this.valueEncoding = null
this.encodeBatch = null
this.activeRequests = []
this.sessions = opts.sessions || []
this.ongc = opts.ongc || null
this.sessions = null
this.ongc = null

this.keyPair = opts.keyPair || null
this.readable = true
Expand All @@ -73,7 +73,7 @@ class Hypercore extends EventEmitter {
this.onwait = opts.onwait || null
this.wait = opts.wait !== false
this.timeout = opts.timeout || 0
this.preload = opts.preload || null
this.preload = null
this.closing = null
this.opening = null

Expand Down Expand Up @@ -217,10 +217,6 @@ class Hypercore extends EventEmitter {
const Clz = opts.class || Hypercore
const s = new Clz(null, this.key, {
...opts,
preload: this.preload,
core: this.core,
sessions: this.sessions,
ongc: this.ongc,
wait,
onwait,
timeout,
Expand Down Expand Up @@ -261,25 +257,32 @@ class Hypercore extends EventEmitter {
}

async _open (storage, key, opts) {
if (opts.preload) {
this.preload = opts.preload
const preload = opts.preload || (opts.parent && opts.parent.preload)

if (preload) {
this.sessions = [] // in case someone looks at it like with peers
this.preload = preload
opts = { ...opts, ...(await this.preload) }
this.preload = null
}

if (opts.sessions && opts.sessions !== this.sessions) this.sessions = opts.sessions
if (opts.ongc) this.ongc = opts.ongc
const parent = opts.parent || null
const core = opts.core || (parent && parent.core)
const sessions = opts.sessions || (parent && parent.sessions)
const ongc = opts.ongc || (parent && parent.ongc)

this._sessionIndex = this.sessions.push(this) - 1
if (core) this.core = core
if (ongc) this.ongc = ongc
if (sessions) this.sessions = sessions

if (storage === null) storage = opts.storage || null
if (key === null) key = opts.key || null
if (this.sessions === null) this.sessions = []
this._sessionIndex = this.sessions.push(this) - 1

if (this.core === null) initOnce(this, storage, key, opts)
if (this._monitorIndex === -2) this.core.addMonitor(this)

try {
await this._openSession(key, opts)
await this._openSession(opts)
} catch (err) {
if (this.closing) return
if (this.core.autoClose && this.core.hasSession() === false) await this.core.close()
Expand All @@ -306,7 +309,7 @@ class Hypercore extends EventEmitter {
if (this.ongc !== null) this.ongc(this)
}

async _openSession (key, opts) {
async _openSession (opts) {
if (this.core.opened === false) await this.core.ready()

if (this.keyPair === null) this.keyPair = opts.keyPair || this.core.header.keyPair
Expand Down Expand Up @@ -1022,7 +1025,10 @@ function readBlock (reader, index) {
}

function initOnce (session, storage, key, opts) {
session.core = opts.core || new Core(Hypercore.defaultStorage(storage), {
if (storage === null) storage = opts.storage || null
if (key === null) key = opts.key || null

session.core = new Core(Hypercore.defaultStorage(storage), {
eagerUpgrade: true,
notDownloadingLinger: opts.notDownloadingLinger,
allowFork: opts.allowFork !== false,
Expand Down

0 comments on commit f19c966

Please sign in to comment.