LumeWeb
/
libhyperproxy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: LumeWeb:6099a6c4f62aa49a9f8d21afbe13e3f3dfd5e60e
Branches Tags
LumeWeb:master
LumeWeb:develop
LumeWeb:v0.0.2-develop.4
LumeWeb:v0.0.2-develop.3
LumeWeb:v0.0.2-develop.2
LumeWeb:v0.0.2-develop.1
LumeWeb:v0.0.1
..
compare: LumeWeb:94e817f0450b9af819249f8ce91315c16fcb5f9e
Branches Tags
LumeWeb:develop
LumeWeb:master
LumeWeb:v0.0.2-develop.4
LumeWeb:v0.0.2-develop.3
LumeWeb:v0.0.2-develop.2
LumeWeb:v0.0.2-develop.1
LumeWeb:v0.0.1

No commits in common. "6099a6c4f62aa49a9f8d21afbe13e3f3dfd5e60e" and "94e817f0450b9af819249f8ce91315c16fcb5f9e" have entirely different histories.
6099a6c4f6 ... 94e817f045

2 changed files with 4 additions and 40 deletions
Show Stats Expand all files Collapse all files

19
dist/peer.js vendored
View File

@ -39,10 +39,9 @@ class Peer {
async init() { async init() {
const self = this; const self = this;
let pipe; let pipe;
const raw = await maybeGetAsyncProperty(self._peer.rawStream);
this._socket = new socket_js_1.default({ this._socket = new socket_js_1.default({
remoteAddress: raw.remoteHost, remoteAddress: self._peer.rawStream.remoteHost,
remotePort: raw.remotePort, remotePort: self._peer.rawStream.remotePort,
remotePublicKey: self._peer.remotePublicKey, remotePublicKey: self._peer.remotePublicKey,
async write(data, cb) { async write(data, cb) {
if (pipe) { if (pipe) {
@ -91,17 +90,3 @@ class Peer {
} }
} }
exports.default = Peer; exports.default = Peer;
async function maybeGetAsyncProperty(object) {
if (typeof object === "function") {
object = object();
}
if (isPromise(object)) {
object = await object;
}
return object;
}
function isPromise(obj) {
return (!!obj &&
(typeof obj === "object" || typeof obj === "function") &&
typeof obj.then === "function");
}

25
src/peer.ts
View File

@ -101,10 +101,9 @@ export default class Peer {
async init() { async init() {
const self = this; const self = this;
let pipe; let pipe;
const raw = await maybeGetAsyncProperty(self._peer.rawStream);
this._socket = new Socket({ this._socket = new Socket({
remoteAddress: raw.remoteHost, remoteAddress: self._peer.rawStream.remoteHost,
remotePort: raw.remotePort, remotePort: self._peer.rawStream.remotePort,
remotePublicKey: self._peer.remotePublicKey, remotePublicKey: self._peer.remotePublicKey,
async write(data: any, cb: Function) { async write(data: any, cb: Function) {
if (pipe) { if (pipe) {
@ -158,23 +157,3 @@ export default class Peer {
await this._channel.open(); await this._channel.open();
} }
} }
async function maybeGetAsyncProperty(object: any) {
if (typeof object === "function") {
object = object();
}
if (isPromise(object)) {
object = await object;
}
return object;
}
function isPromise(obj: Promise<any>) {
return (
!!obj &&
(typeof obj === "object" || typeof obj === "function") &&
typeof obj.then === "function"
);
}