Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
X
xxdk-wasm
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
elixxir
xxdk-wasm
Commits
d00a91b3
Commit
d00a91b3
authored
2 years ago
by
Jake Taylor
Browse files
Options
Downloads
Patches
Plain Diff
fix crashes
parent
0ceb7d08
No related branches found
No related tags found
4 merge requests
!60
Revert "Fail a test to be sure it works"
,
!39
first pass at adding dm package to indexedDb, split some shared code into utils
,
!36
project/DM
,
!32
Admin Commands
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indexedDb/dm/implementation.go
+50
-35
50 additions, 35 deletions
indexedDb/dm/implementation.go
indexedDb/utils.go
+11
-7
11 additions, 7 deletions
indexedDb/utils.go
with
61 additions
and
42 deletions
indexedDb/dm/implementation.go
+
50
−
35
View file @
d00a91b3
...
@@ -19,6 +19,7 @@ import (
...
@@ -19,6 +19,7 @@ import (
"gitlab.com/elixxir/xxdk-wasm/indexedDb"
"gitlab.com/elixxir/xxdk-wasm/indexedDb"
"gitlab.com/elixxir/xxdk-wasm/utils"
"gitlab.com/elixxir/xxdk-wasm/utils"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/id"
"strings"
"sync"
"sync"
"syscall/js"
"syscall/js"
"time"
"time"
...
@@ -99,14 +100,16 @@ func (w *wasmModel) Receive(messageID dm.MessageID, nickname string, text []byte
...
@@ -99,14 +100,16 @@ func (w *wasmModel) Receive(messageID dm.MessageID, nickname string, text []byte
var
err
error
var
err
error
// If there is no extant Conversation, create one.
// If there is no extant Conversation, create one.
if
result
,
err
:=
indexedDb
.
Get
(
w
.
db
,
conversationStoreName
,
if
_
,
err
:=
indexedDb
.
Get
(
w
.
db
,
conversationStoreName
,
utils
.
CopyBytesToJS
(
pubKey
));
err
!=
nil
{
utils
.
CopyBytesToJS
(
pubKey
));
err
!=
nil
{
if
strings
.
Contains
(
err
.
Error
(),
indexedDb
.
ErrDoesNotExist
)
{
jww
.
ERROR
.
Printf
(
"%+v"
,
errors
.
WithMessagef
(
parentErr
,
err
=
w
.
joinConversation
(
nickname
,
pubKey
,
dmToken
,
codeset
)
"Unable to get Conversation: %+v"
,
err
))
if
err
!=
nil
{
return
0
jww
.
ERROR
.
Printf
(
"%+v"
,
err
)
}
else
if
len
(
result
)
==
0
{
}
err
=
w
.
joinConversation
(
nickname
,
pubKey
,
dmToken
,
codeset
)
}
else
{
jww
.
ERROR
.
Printf
(
"%+v"
,
err
)
jww
.
ERROR
.
Printf
(
"%+v"
,
errors
.
WithMessagef
(
parentErr
,
"Unable to get Conversation: %+v"
,
err
))
}
return
0
return
0
}
else
{
}
else
{
jww
.
DEBUG
.
Printf
(
"Conversation with %s already joined"
,
nickname
)
jww
.
DEBUG
.
Printf
(
"Conversation with %s already joined"
,
nickname
)
...
@@ -139,14 +142,16 @@ func (w *wasmModel) ReceiveText(messageID dm.MessageID, nickname, text string,
...
@@ -139,14 +142,16 @@ func (w *wasmModel) ReceiveText(messageID dm.MessageID, nickname, text string,
var
err
error
var
err
error
// If there is no extant Conversation, create one.
// If there is no extant Conversation, create one.
if
result
,
err
:=
indexedDb
.
Get
(
w
.
db
,
conversationStoreName
,
if
_
,
err
:=
indexedDb
.
Get
(
w
.
db
,
conversationStoreName
,
utils
.
CopyBytesToJS
(
pubKey
));
err
!=
nil
{
utils
.
CopyBytesToJS
(
pubKey
));
err
!=
nil
{
if
strings
.
Contains
(
err
.
Error
(),
indexedDb
.
ErrDoesNotExist
)
{
jww
.
ERROR
.
Printf
(
"%+v"
,
errors
.
WithMessagef
(
parentErr
,
err
=
w
.
joinConversation
(
nickname
,
pubKey
,
dmToken
,
codeset
)
"Unable to get Conversation: %+v"
,
err
))
if
err
!=
nil
{
return
0
jww
.
ERROR
.
Printf
(
"%+v"
,
err
)
}
else
if
len
(
result
)
==
0
{
}
err
=
w
.
joinConversation
(
nickname
,
pubKey
,
dmToken
,
codeset
)
}
else
{
jww
.
ERROR
.
Printf
(
"%+v"
,
err
)
jww
.
ERROR
.
Printf
(
"%+v"
,
errors
.
WithMessagef
(
parentErr
,
"Unable to get Conversation: %+v"
,
err
))
}
return
0
return
0
}
else
{
}
else
{
jww
.
DEBUG
.
Printf
(
"Conversation with %s already joined"
,
nickname
)
jww
.
DEBUG
.
Printf
(
"Conversation with %s already joined"
,
nickname
)
...
@@ -181,14 +186,16 @@ func (w *wasmModel) ReceiveReply(messageID dm.MessageID, reactionTo dm.MessageID
...
@@ -181,14 +186,16 @@ func (w *wasmModel) ReceiveReply(messageID dm.MessageID, reactionTo dm.MessageID
var
err
error
var
err
error
// If there is no extant Conversation, create one.
// If there is no extant Conversation, create one.
if
result
,
err
:=
indexedDb
.
Get
(
w
.
db
,
conversationStoreName
,
if
_
,
err
:=
indexedDb
.
Get
(
w
.
db
,
conversationStoreName
,
utils
.
CopyBytesToJS
(
pubKey
));
err
!=
nil
{
utils
.
CopyBytesToJS
(
pubKey
));
err
!=
nil
{
if
strings
.
Contains
(
err
.
Error
(),
indexedDb
.
ErrDoesNotExist
)
{
jww
.
ERROR
.
Printf
(
"%+v"
,
errors
.
WithMessagef
(
parentErr
,
err
=
w
.
joinConversation
(
nickname
,
pubKey
,
dmToken
,
codeset
)
"Unable to get Conversation: %+v"
,
err
))
if
err
!=
nil
{
return
0
jww
.
ERROR
.
Printf
(
"%+v"
,
err
)
}
else
if
len
(
result
)
==
0
{
}
err
=
w
.
joinConversation
(
nickname
,
pubKey
,
dmToken
,
codeset
)
}
else
{
jww
.
ERROR
.
Printf
(
"%+v"
,
err
)
jww
.
ERROR
.
Printf
(
"%+v"
,
errors
.
WithMessagef
(
parentErr
,
"Unable to get Conversation: %+v"
,
err
))
}
return
0
return
0
}
else
{
}
else
{
jww
.
DEBUG
.
Printf
(
"Conversation with %s already joined"
,
nickname
)
jww
.
DEBUG
.
Printf
(
"Conversation with %s already joined"
,
nickname
)
...
@@ -223,14 +230,16 @@ func (w *wasmModel) ReceiveReaction(messageID dm.MessageID, reactionTo dm.Messag
...
@@ -223,14 +230,16 @@ func (w *wasmModel) ReceiveReaction(messageID dm.MessageID, reactionTo dm.Messag
var
err
error
var
err
error
// If there is no extant Conversation, create one.
// If there is no extant Conversation, create one.
if
result
,
err
:=
indexedDb
.
Get
(
w
.
db
,
conversationStoreName
,
if
_
,
err
:=
indexedDb
.
Get
(
w
.
db
,
conversationStoreName
,
utils
.
CopyBytesToJS
(
pubKey
));
err
!=
nil
{
utils
.
CopyBytesToJS
(
pubKey
));
err
!=
nil
{
if
strings
.
Contains
(
err
.
Error
(),
indexedDb
.
ErrDoesNotExist
)
{
jww
.
ERROR
.
Printf
(
"%+v"
,
errors
.
WithMessagef
(
parentErr
,
err
=
w
.
joinConversation
(
nickname
,
pubKey
,
dmToken
,
codeset
)
"Unable to get Conversation: %+v"
,
err
))
if
err
!=
nil
{
return
0
jww
.
ERROR
.
Printf
(
"%+v"
,
err
)
}
else
if
len
(
result
)
==
0
{
}
err
=
w
.
joinConversation
(
nickname
,
pubKey
,
dmToken
,
codeset
)
}
else
{
jww
.
ERROR
.
Printf
(
"%+v"
,
err
)
jww
.
ERROR
.
Printf
(
"%+v"
,
errors
.
WithMessagef
(
parentErr
,
"Unable to get Conversation: %+v"
,
err
))
}
return
0
return
0
}
else
{
}
else
{
jww
.
DEBUG
.
Printf
(
"Conversation with %s already joined"
,
nickname
)
jww
.
DEBUG
.
Printf
(
"Conversation with %s already joined"
,
nickname
)
...
@@ -258,8 +267,9 @@ func (w *wasmModel) ReceiveReaction(messageID dm.MessageID, reactionTo dm.Messag
...
@@ -258,8 +267,9 @@ func (w *wasmModel) ReceiveReaction(messageID dm.MessageID, reactionTo dm.Messag
return
uuid
return
uuid
}
}
func
(
w
*
wasmModel
)
UpdateSentStatus
(
uuid
uint64
,
messageID
dm
.
MessageID
,
func
(
w
*
wasmModel
)
UpdateSentStatus
(
uuid
uint64
,
timestamp
time
.
Time
,
round
rounds
.
Round
,
status
dm
.
Status
)
{
messageID
dm
.
MessageID
,
timestamp
time
.
Time
,
round
rounds
.
Round
,
status
dm
.
Status
)
{
parentErr
:=
errors
.
New
(
"failed to UpdateSentStatus"
)
parentErr
:=
errors
.
New
(
"failed to UpdateSentStatus"
)
// FIXME: this is a bit of race condition without the mux.
// FIXME: this is a bit of race condition without the mux.
...
@@ -274,15 +284,20 @@ func (w *wasmModel) UpdateSentStatus(uuid uint64, messageID dm.MessageID,
...
@@ -274,15 +284,20 @@ func (w *wasmModel) UpdateSentStatus(uuid uint64, messageID dm.MessageID,
// Use the key to get the existing Message
// Use the key to get the existing Message
currentMsg
,
err
:=
indexedDb
.
Get
(
w
.
db
,
messageStoreName
,
key
)
currentMsg
,
err
:=
indexedDb
.
Get
(
w
.
db
,
messageStoreName
,
key
)
if
err
!=
nil
{
if
err
!=
nil
{
jww
.
ERROR
.
Printf
(
"%+v"
,
errors
.
WithMessagef
(
parentErr
,
"Unable to get message: %+v"
,
err
))
return
return
}
}
// Extract the existing Message and update the Status
// Extract the existing Message and update the Status
newMessage
:=
&
Message
{}
newMessage
:=
&
Message
{}
err
=
json
.
Unmarshal
([]
byte
(
currentMsg
),
newMessage
)
err
=
json
.
Unmarshal
([]
byte
(
utils
.
JsToJson
(
currentMsg
)
)
,
newMessage
)
if
err
!=
nil
{
if
err
!=
nil
{
jww
.
ERROR
.
Printf
(
"%+v"
,
errors
.
WithMessagef
(
parentErr
,
"Could not JSON unmarshal message: %+v"
,
err
))
return
return
}
}
newMessage
.
Status
=
uint8
(
status
)
newMessage
.
Status
=
uint8
(
status
)
if
!
messageID
.
Equals
(
dm
.
MessageID
{})
{
if
!
messageID
.
Equals
(
dm
.
MessageID
{})
{
newMessage
.
MessageID
=
messageID
.
Bytes
()
newMessage
.
MessageID
=
messageID
.
Bytes
()
...
...
This diff is collapsed.
Click to expand it.
indexedDb/utils.go
+
11
−
7
View file @
d00a91b3
...
@@ -22,9 +22,13 @@ import (
...
@@ -22,9 +22,13 @@ import (
"time"
"time"
)
)
// dbTimeout is the global timeout for operations with the storage
const
(
// [context.Context].
// dbTimeout is the global timeout for operations with the storage
const
dbTimeout
=
time
.
Second
// [context.Context].
dbTimeout
=
time
.
Second
// ErrDoesNotExist is an error string for got undefined on Get operations.
ErrDoesNotExist
=
"result is undefined"
)
// NewContext builds a context for indexedDb operations.
// NewContext builds a context for indexedDb operations.
func
NewContext
()
(
context
.
Context
,
context
.
CancelFunc
)
{
func
NewContext
()
(
context
.
Context
,
context
.
CancelFunc
)
{
...
@@ -62,8 +66,8 @@ func Get(db *idb.Database, objectStoreName string, key js.Value) (js.Value, erro
...
@@ -62,8 +66,8 @@ func Get(db *idb.Database, objectStoreName string, key js.Value) (js.Value, erro
return
js
.
Undefined
(),
errors
.
WithMessagef
(
parentErr
,
return
js
.
Undefined
(),
errors
.
WithMessagef
(
parentErr
,
"Unable to get from ObjectStore: %+v"
,
err
)
"Unable to get from ObjectStore: %+v"
,
err
)
}
else
if
resultObj
.
IsUndefined
()
{
}
else
if
resultObj
.
IsUndefined
()
{
return
js
.
Undefined
(),
errors
.
WithMessage
(
parentErr
,
return
js
.
Undefined
(),
errors
.
WithMessage
f
(
parentErr
,
"Unable to get from ObjectStore:
result is undefined"
)
"Unable to get from ObjectStore:
%s"
,
ErrDoesNotExist
)
}
}
// Process result into string
// Process result into string
...
@@ -111,8 +115,8 @@ func GetIndex(db *idb.Database, objectStoreName string,
...
@@ -111,8 +115,8 @@ func GetIndex(db *idb.Database, objectStoreName string,
return
js
.
Undefined
(),
errors
.
WithMessagef
(
parentErr
,
return
js
.
Undefined
(),
errors
.
WithMessagef
(
parentErr
,
"Unable to get from ObjectStore: %+v"
,
err
)
"Unable to get from ObjectStore: %+v"
,
err
)
}
else
if
resultObj
.
IsUndefined
()
{
}
else
if
resultObj
.
IsUndefined
()
{
return
js
.
Undefined
(),
errors
.
WithMessage
(
parentErr
,
return
js
.
Undefined
(),
errors
.
WithMessage
f
(
parentErr
,
"Unable to get from ObjectStore:
result is undefined"
)
"Unable to get from ObjectStore:
%s"
,
ErrDoesNotExist
)
}
}
// Process result into string
// Process result into string
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment