Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
0d6479e1
Commit
0d6479e1
authored
Nov 07, 2014
by
Marek Kotewicz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
proper error handling proposal
parent
b0e11826
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
13 deletions
+18
-13
httprpc.js
httprpc.js
+3
-2
main.js
main.js
+15
-11
No files found.
httprpc.js
View file @
0d6479e1
...
...
@@ -40,7 +40,8 @@
return
{
_id
:
object
.
id
,
data
:
object
.
result
data
:
object
.
result
,
error
:
object
.
error
};
};
...
...
@@ -70,7 +71,7 @@
var
self
=
this
;
this
.
sendRequest
(
payload
,
function
(
request
)
{
var
parsed
=
JSON
.
parse
(
request
.
responseText
);
if
(
parsed
.
result
instanceof
Array
?
parsed
.
result
.
length
===
0
:
!
parsed
.
result
)
{
if
(
parsed
.
error
||
(
parsed
.
result
instanceof
Array
?
parsed
.
result
.
length
===
0
:
!
parsed
.
result
)
)
{
return
;
}
self
.
handlers
.
forEach
(
function
(
handler
)
{
...
...
main.js
View file @
0d6479e1
...
...
@@ -153,15 +153,15 @@
return
{
call
:
call
,
args
:
args
};
}).
then
(
function
(
request
)
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
web3
.
provider
.
send
(
request
,
function
(
result
)
{
if
(
result
||
typeof
result
===
"boolean"
)
{
web3
.
provider
.
send
(
request
,
function
(
err
,
result
)
{
if
(
!
err
)
{
resolve
(
result
);
return
;
}
reject
(
result
);
reject
(
err
);
});
});
}).
catch
(
function
(
err
)
{
}).
catch
(
function
(
err
)
{
console
.
error
(
err
);
});
};
...
...
@@ -173,8 +173,12 @@
var
proto
=
{};
proto
.
get
=
function
()
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
web3
.
provider
.
send
({
call
:
property
.
getter
},
function
(
result
)
{
resolve
(
result
);
web3
.
provider
.
send
({
call
:
property
.
getter
},
function
(
err
,
result
)
{
if
(
!
err
)
{
resolve
(
result
);
return
}
reject
(
err
);
});
});
};
...
...
@@ -182,12 +186,12 @@
proto
.
set
=
function
(
val
)
{
return
flattenPromise
([
val
]).
then
(
function
(
args
)
{
return
new
Promise
(
function
(
resolve
)
{
web3
.
provider
.
send
({
call
:
property
.
setter
,
args
:
args
},
function
(
result
)
{
if
(
result
)
{
web3
.
provider
.
send
({
call
:
property
.
setter
,
args
:
args
},
function
(
err
,
result
)
{
if
(
!
err
)
{
resolve
(
result
);
}
else
{
reject
(
result
);
return
}
reject
(
err
);
});
});
}).
catch
(
function
(
err
)
{
...
...
@@ -438,7 +442,7 @@
if
(
data
.
_id
)
{
var
cb
=
web3
.
_callbacks
[
data
.
_id
];
if
(
cb
)
{
cb
.
call
(
this
,
data
.
data
)
cb
.
call
(
this
,
data
.
error
,
data
.
data
)
delete
web3
.
_callbacks
[
data
.
_id
];
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment