Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade version to 1.8.0 #174

Merged
merged 14 commits into from
Apr 17, 2024
Merged

Upgrade version to 1.8.0 #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e8d74dd
Merge pull request #170 from ainblockchain/release/v1.7.1
platfowner Apr 5, 2024
3eb7056
fix: replace ws with isomorphic-ws.
jiyoung-an Apr 10, 2024
0422cec
fix: disable isomorphic-ws patch package.
jiyoung-an Apr 11, 2024
bbf84cb
Upgrade packages and update tests
platfowner Apr 15, 2024
a24b8f4
Add todos for handshake timeout and ping-pong
platfowner Apr 15, 2024
eb32d0a
Merge pull request #172 from ainblockchain/bugfix/jiyoung/browser-web…
jiyoung-an Apr 15, 2024
12d49fa
Remove heartbeatIntervalMs from EventChannelConnectionOptions
platfowner Apr 15, 2024
c518336
Add ping-pong message types
platfowner Apr 15, 2024
a8039b7
Implement heartbeat with custom ping-pong
platfowner Apr 15, 2024
7a1256a
Implement custom handshake timeout using setTimeout()
platfowner Apr 15, 2024
8176b33
Set _heartbeatTimeout to be null when cleared
platfowner Apr 15, 2024
59f8ab0
Fix @types/ws package version to 8.5.3 for compatibility
platfowner Apr 16, 2024
95b4533
Merge pull request #173 from ainblockchain/bugfix/platfowner/bugfix
platfowner Apr 16, 2024
0711de2
Upgrade version to 1.8.0
platfowner Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 65 additions & 65 deletions __tests__/__snapshots__/ain.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,77 +1,77 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`ain-js Database evalOwner 1`] = `
Object {
{
"code": 0,
"matched": Object {
"closestOwner": Object {
"config": Object {
"owners": Object {
"*": Object {
"matched": {
"closestOwner": {
"config": {
"owners": {
"*": {
"branch_owner": true,
"write_function": true,
"write_owner": true,
"write_rule": true,
},
"0x09A0d53FDf1c36A131938eb379b98910e55EEfe1": Object {
"0x09A0d53FDf1c36A131938eb379b98910e55EEfe1": {
"branch_owner": true,
"write_function": true,
"write_owner": true,
"write_rule": true,
},
},
},
"path": Array [
"path": [
"apps",
"bfan",
"users",
"0x09A0d53FDf1c36A131938eb379b98910e55EEfe1",
],
},
"matchedOwnerPath": Array [
"matchedOwnerPath": [
"apps",
"bfan",
"users",
"0x09A0d53FDf1c36A131938eb379b98910e55EEfe1",
],
"subtreeOwners": Array [],
"subtreeOwners": [],
},
}
`;

exports[`ain-js Database evalRule: true 1`] = `
Object {
{
"code": 0,
"matched": Object {
"state": Object {
"closestRule": Object {
"matched": {
"state": {
"closestRule": {
"config": null,
"path": Array [],
"path": [],
},
"matchedRulePath": Array [
"matchedRulePath": [
"apps",
"bfan",
"users",
"0x09A0d53FDf1c36A131938eb379b98910e55EEfe1",
"can",
"write",
],
"matchedValuePath": Array [
"matchedValuePath": [
"apps",
"bfan",
"users",
"0x09A0d53FDf1c36A131938eb379b98910e55EEfe1",
"can",
"write",
],
"pathVars": Object {},
"pathVars": {},
},
"write": Object {
"closestRule": Object {
"config": Object {
"write": {
"closestRule": {
"config": {
"write": "true",
},
"path": Array [
"path": [
"apps",
"bfan",
"users",
Expand All @@ -80,24 +80,24 @@ Object {
"write",
],
},
"matchedRulePath": Array [
"matchedRulePath": [
"apps",
"bfan",
"users",
"0x09A0d53FDf1c36A131938eb379b98910e55EEfe1",
"can",
"write",
],
"matchedValuePath": Array [
"matchedValuePath": [
"apps",
"bfan",
"users",
"0x09A0d53FDf1c36A131938eb379b98910e55EEfe1",
"can",
"write",
],
"pathVars": Object {},
"subtreeRules": Array [],
"pathVars": {},
"subtreeRules": [],
},
},
}
Expand All @@ -106,28 +106,28 @@ Object {
exports[`ain-js Database get with options 1`] = `null`;

exports[`ain-js Database get with options 2`] = `
Object {
"can": Object {
{
"can": {
"write": -5,
},
"username": "test_user",
}
`;

exports[`ain-js Database get with options 3`] = `
Object {
"can": Object {
{
"can": {
"#state_ph": "0xaf1e44f55da6d7e1aa784dd38372c2c2939570254c6b3f36f80b4878590a9efa",
},
"username": "test_user",
}
`;

exports[`ain-js Database get with options 4`] = `
Object {
{
"#state_ph": "0x3c067fd41205e87fcead2107a0f346881ea7d95249cdbe34d3d72e28e7c9ecd5",
"#state_ph:username": "0xe9acb84e18d9ec64c66358f53c4fec3945eb065a3e98de907d8d80dc1361c82f",
"can": Object {
"can": {
"#state_ph": "0xaf1e44f55da6d7e1aa784dd38372c2c2939570254c6b3f36f80b4878590a9efa",
"#state_ph:write": "0x60ae6f7084539f2137ca3b45aa2e0e3b6d786a17c8de32110a884e285ea6a00c",
"write": -5,
Expand All @@ -137,7 +137,7 @@ Object {
`;

exports[`ain-js Database get with options 5`] = `
Object {
{
"#num_children": 2,
"#num_children:username": 0,
"#num_parents": 1,
Expand All @@ -150,7 +150,7 @@ Object {
"#tree_max_siblings:username": 1,
"#tree_size": 4,
"#tree_size:username": 1,
"can": Object {
"can": {
"#num_children": 1,
"#num_children:write": 0,
"#num_parents": 1,
Expand All @@ -172,7 +172,7 @@ Object {
exports[`ain-js Database getProofHash 1`] = `"0x88496dfee3566db91f487aa4cbf69a0c42a3e2a5d0a65bfd4897d699e8734785"`;

exports[`ain-js Database getStateInfo 1`] = `
Object {
{
"#num_children": 1,
"#state_ph": "0x985a1f057d5047b1dee392127eb776571fbbe79da7ae6114f8f8f18c4f786135",
"#tree_bytes": 1840,
Expand All @@ -184,38 +184,38 @@ Object {
`;

exports[`ain-js Database matchFunction 1`] = `
Object {
"matched_config": Object {
"config": Object {
"0xFUNCTION_HASH": Object {
{
"matched_config": {
"config": {
"0xFUNCTION_HASH": {
"function_id": "0xFUNCTION_HASH",
"function_type": "REST",
"function_url": "https://events.ainetwork.ai/trigger",
},
},
"path": "/apps/bfan/users/0x09A0d53FDf1c36A131938eb379b98910e55EEfe1",
},
"matched_path": Object {
"path_vars": Object {},
"matched_path": {
"path_vars": {},
"ref_path": "/apps/bfan/users/0x09A0d53FDf1c36A131938eb379b98910e55EEfe1",
"target_path": "/apps/bfan/users/0x09A0d53FDf1c36A131938eb379b98910e55EEfe1",
},
"subtree_configs": Array [],
"subtree_configs": [],
}
`;

exports[`ain-js Database matchOwner 1`] = `
Object {
"matched_config": Object {
"config": Object {
"owners": Object {
"*": Object {
{
"matched_config": {
"config": {
"owners": {
"*": {
"branch_owner": true,
"write_function": true,
"write_owner": true,
"write_rule": true,
},
"0x09A0d53FDf1c36A131938eb379b98910e55EEfe1": Object {
"0x09A0d53FDf1c36A131938eb379b98910e55EEfe1": {
"branch_owner": true,
"write_function": true,
"write_owner": true,
Expand All @@ -225,47 +225,47 @@ Object {
},
"path": "/apps/bfan/users/0x09A0d53FDf1c36A131938eb379b98910e55EEfe1",
},
"matched_path": Object {
"matched_path": {
"target_path": "/apps/bfan/users/0x09A0d53FDf1c36A131938eb379b98910e55EEfe1",
},
"subtree_configs": Array [],
"subtree_configs": [],
}
`;

exports[`ain-js Database matchRule 1`] = `
Object {
"state": Object {
"matched_config": Object {
{
"state": {
"matched_config": {
"config": null,
"path": "/",
},
"matched_path": Object {
"path_vars": Object {},
"matched_path": {
"path_vars": {},
"ref_path": "/apps/bfan/users/0x09A0d53FDf1c36A131938eb379b98910e55EEfe1",
"target_path": "/apps/bfan/users/0x09A0d53FDf1c36A131938eb379b98910e55EEfe1",
},
},
"write": Object {
"matched_config": Object {
"config": Object {
"write": {
"matched_config": {
"config": {
"write": "true",
},
"path": "/apps/bfan/users/0x09A0d53FDf1c36A131938eb379b98910e55EEfe1",
},
"matched_path": Object {
"path_vars": Object {},
"matched_path": {
"path_vars": {},
"ref_path": "/apps/bfan/users/0x09A0d53FDf1c36A131938eb379b98910e55EEfe1",
"target_path": "/apps/bfan/users/0x09A0d53FDf1c36A131938eb379b98910e55EEfe1",
},
"subtree_configs": Array [
Object {
"config": Object {
"subtree_configs": [
{
"config": {
"write": "true",
},
"path": "/can/write",
},
Object {
"config": Object {
{
"config": {
"write": "false",
},
"path": "/cannot/write",
Expand Down
21 changes: 11 additions & 10 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ainblockchain/ain-js",
"version": "1.7.1",
"version": "1.8.0",
"description": "",
"main": "lib/ain.js",
"scripts": {
Expand Down Expand Up @@ -39,26 +39,27 @@
],
"devDependencies": {
"@mxssfd/typedoc-theme": "^1.1.3",
"@types/jest": "^27.0.2",
"@types/ws": "^8.5.3",
"jest": "^27.3.1",
"ts-jest": "^27.0.7",
"typedoc": "^0.25.1",
"@types/jest": "^29.5.12",
"jest": "^29.7.0",
"ts-jest": "^29.1.2",
"typedoc": "^0.25.13",
"typedoc-plugin-remove-references": "^0.0.6",
"typedoc-plugin-rename-defaults": "^0.6.6",
"typedoc-theme-hierarchy": "^4.1.1",
"typescript": "^5.2.2"
"typedoc-plugin-rename-defaults": "^0.7.0",
"typedoc-theme-hierarchy": "^4.1.2",
"typescript": "^5.4.5"
},
"dependencies": {
"@ainblockchain/ain-util": "^1.1.9",
"@types/node": "^12.7.3",
"@types/randombytes": "^2.0.0",
"@types/semver": "^7.3.4",
"@types/ws": "8.5.3",
"axios": "^0.21.4",
"bip39": "^3.0.2",
"browserify-cipher": "^1.0.1",
"eventemitter3": "^4.0.0",
"hdkey": "^1.1.1",
"isomorphic-ws": "^5.0.0",
"lodash": "^4.17.20",
"node-seal": "^4.5.7",
"pbkdf2": "^3.0.17",
Expand All @@ -67,6 +68,6 @@
"semver": "^6.3.0",
"url-parse": "^1.4.7",
"uuid": "^3.3.3",
"ws": "^8.2.3"
"ws": "^8.16.0"
}
}
Loading
Loading