cojson-storage-sqlite 0.9.12 → 0.9.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/turbo-build.log +1 -1
- package/CHANGELOG.md +17 -0
- package/dist/sqliteClient.js +9 -2
- package/dist/sqliteClient.js.map +1 -1
- package/dist/sqliteNode.js +4 -11
- package/dist/sqliteNode.js.map +1 -1
- package/package.json +3 -3
- package/src/sqliteClient.ts +15 -3
- package/src/sqliteNode.ts +10 -26
package/.turbo/turbo-build.log
CHANGED
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,22 @@
|
|
|
1
1
|
# cojson-storage-sqlite
|
|
2
2
|
|
|
3
|
+
## 0.9.18
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies [8898b10]
|
|
8
|
+
- cojson@0.9.18
|
|
9
|
+
- cojson-storage@0.9.18
|
|
10
|
+
|
|
11
|
+
## 0.9.13
|
|
12
|
+
|
|
13
|
+
### Patch Changes
|
|
14
|
+
|
|
15
|
+
- 8d29e50: Restore the logger wrapper and adapt the API to pino
|
|
16
|
+
- Updated dependencies [8d29e50]
|
|
17
|
+
- cojson-storage@0.9.13
|
|
18
|
+
- cojson@0.9.13
|
|
19
|
+
|
|
3
20
|
## 0.9.12
|
|
4
21
|
|
|
5
22
|
### Patch Changes
|
package/dist/sqliteClient.js
CHANGED
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
import { logger, } from "cojson";
|
|
2
|
+
export function getErrorMessage(error) {
|
|
3
|
+
return error instanceof Error ? error.message : "Unknown error";
|
|
4
|
+
}
|
|
1
5
|
export class SQLiteClient {
|
|
2
6
|
constructor(db, toLocalNode) {
|
|
3
7
|
this.db = db;
|
|
@@ -18,7 +22,10 @@ export class SQLiteClient {
|
|
|
18
22
|
};
|
|
19
23
|
}
|
|
20
24
|
catch (e) {
|
|
21
|
-
|
|
25
|
+
const headerValue = coValueRow?.header ?? "";
|
|
26
|
+
logger.warn("Invalid JSON in header: " + headerValue, {
|
|
27
|
+
id: coValueId,
|
|
28
|
+
});
|
|
22
29
|
return;
|
|
23
30
|
}
|
|
24
31
|
}
|
|
@@ -38,7 +45,7 @@ export class SQLiteClient {
|
|
|
38
45
|
}));
|
|
39
46
|
}
|
|
40
47
|
catch (e) {
|
|
41
|
-
|
|
48
|
+
logger.warn("Invalid JSON in transaction");
|
|
42
49
|
return [];
|
|
43
50
|
}
|
|
44
51
|
}
|
package/dist/sqliteClient.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqliteClient.js","sourceRoot":"","sources":["../src/sqliteClient.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sqliteClient.js","sourceRoot":"","sources":["../src/sqliteClient.ts"],"names":[],"mappings":"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"}
|
package/dist/sqliteNode.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import Database from "better-sqlite3";
|
|
2
|
-
import { cojsonInternals, } from "cojson";
|
|
2
|
+
import { cojsonInternals, logger, } from "cojson";
|
|
3
3
|
import { SyncManager } from "cojson-storage";
|
|
4
4
|
import { SQLiteClient } from "./sqliteClient.js";
|
|
5
5
|
export class SQLiteNode {
|
|
@@ -24,13 +24,13 @@ export class SQLiteNode {
|
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
26
|
catch (e) {
|
|
27
|
-
|
|
27
|
+
logger.error(`Error reading from localNode, handling msg\n\n${JSON.stringify(msg, (k, v) => k === "changes" || k === "encryptedChanges"
|
|
28
28
|
? v.slice(0, 20) + "..."
|
|
29
|
-
: v)}
|
|
29
|
+
: v)}`);
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
32
|
};
|
|
33
|
-
processMessages().catch((e) =>
|
|
33
|
+
processMessages().catch((e) => logger.error("Error in processMessages in sqlite", e));
|
|
34
34
|
}
|
|
35
35
|
static async asPeer({ filename, trace, localNodeName = "local", }) {
|
|
36
36
|
const [localNodeAsPeer, storageAsPeer] = cojsonInternals.connectedPeers(localNodeName, "storage", { peer1role: "client", peer2role: "storage", trace, crashOnClose: true });
|
|
@@ -41,9 +41,7 @@ export class SQLiteNode {
|
|
|
41
41
|
const db = Database(filename);
|
|
42
42
|
db.pragma("journal_mode = WAL");
|
|
43
43
|
const oldVersion = db.pragma("user_version")[0].user_version;
|
|
44
|
-
console.log("DB version", oldVersion);
|
|
45
44
|
if (oldVersion === 0) {
|
|
46
|
-
console.log("Migration 0 -> 1: Basic schema");
|
|
47
45
|
db.prepare(`CREATE TABLE IF NOT EXISTS transactions (
|
|
48
46
|
ses INTEGER,
|
|
49
47
|
idx INTEGER,
|
|
@@ -66,11 +64,9 @@ export class SQLiteNode {
|
|
|
66
64
|
);`).run();
|
|
67
65
|
db.prepare(`CREATE INDEX IF NOT EXISTS coValuesByID ON coValues (id);`).run();
|
|
68
66
|
db.pragma("user_version = 1");
|
|
69
|
-
console.log("Migration 0 -> 1: Basic schema - done");
|
|
70
67
|
}
|
|
71
68
|
if (oldVersion <= 1) {
|
|
72
69
|
// fix embarrassing off-by-one error for transaction indices
|
|
73
|
-
console.log("Migration 1 -> 2: Fix off-by-one error for transaction indices");
|
|
74
70
|
const txs = db
|
|
75
71
|
.prepare(`SELECT * FROM transactions`)
|
|
76
72
|
.all();
|
|
@@ -80,10 +76,8 @@ export class SQLiteNode {
|
|
|
80
76
|
db.prepare(`INSERT INTO transactions (ses, idx, tx) VALUES (?, ?, ?)`).run(tx.ses, tx.idx, tx.tx);
|
|
81
77
|
}
|
|
82
78
|
db.pragma("user_version = 2");
|
|
83
|
-
console.log("Migration 1 -> 2: Fix off-by-one error for transaction indices - done");
|
|
84
79
|
}
|
|
85
80
|
if (oldVersion <= 2) {
|
|
86
|
-
console.log("Migration 2 -> 3: Add signatureAfter");
|
|
87
81
|
db.prepare(`CREATE TABLE IF NOT EXISTS signatureAfter (
|
|
88
82
|
ses INTEGER,
|
|
89
83
|
idx INTEGER,
|
|
@@ -92,7 +86,6 @@ export class SQLiteNode {
|
|
|
92
86
|
) WITHOUT ROWID;`).run();
|
|
93
87
|
db.prepare(`ALTER TABLE sessions ADD COLUMN bytesSinceLastSignature INTEGER;`).run();
|
|
94
88
|
db.pragma("user_version = 3");
|
|
95
|
-
console.log("Migration 2 -> 3: Add signatureAfter - done!!");
|
|
96
89
|
}
|
|
97
90
|
return new SQLiteNode(db, fromLocalNode, toLocalNode);
|
|
98
91
|
}
|
package/dist/sqliteNode.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqliteNode.js","sourceRoot":"","sources":["../src/sqliteNode.ts"],"names":[],"mappings":"AAAA,OAAO,QAAmC,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAIL,eAAe,
|
|
1
|
+
{"version":3,"file":"sqliteNode.js","sourceRoot":"","sources":["../src/sqliteNode.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cojson-storage-sqlite",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.9.
|
|
4
|
+
"version": "0.9.18",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "src/index.ts",
|
|
7
7
|
"license": "MIT",
|
|
8
8
|
"dependencies": {
|
|
9
9
|
"better-sqlite3": "^11.7.0",
|
|
10
|
-
"cojson": "0.9.
|
|
11
|
-
"cojson-storage": "0.9.
|
|
10
|
+
"cojson": "0.9.18",
|
|
11
|
+
"cojson-storage": "0.9.18"
|
|
12
12
|
},
|
|
13
13
|
"devDependencies": {
|
|
14
14
|
"@types/better-sqlite3": "^7.6.12",
|
package/src/sqliteClient.ts
CHANGED
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
import { Database as DatabaseT } from "better-sqlite3";
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
CojsonInternalTypes,
|
|
4
|
+
OutgoingSyncQueue,
|
|
5
|
+
SessionID,
|
|
6
|
+
logger,
|
|
7
|
+
} from "cojson";
|
|
3
8
|
import RawCoID = CojsonInternalTypes.RawCoID;
|
|
4
9
|
import Signature = CojsonInternalTypes.Signature;
|
|
5
10
|
import Transaction = CojsonInternalTypes.Transaction;
|
|
@@ -23,6 +28,10 @@ export type RawTransactionRow = {
|
|
|
23
28
|
tx: string;
|
|
24
29
|
};
|
|
25
30
|
|
|
31
|
+
export function getErrorMessage(error: unknown) {
|
|
32
|
+
return error instanceof Error ? error.message : "Unknown error";
|
|
33
|
+
}
|
|
34
|
+
|
|
26
35
|
export class SQLiteClient implements DBClientInterface {
|
|
27
36
|
private readonly db: DatabaseT;
|
|
28
37
|
private readonly toLocalNode: OutgoingSyncQueue;
|
|
@@ -48,7 +57,10 @@ export class SQLiteClient implements DBClientInterface {
|
|
|
48
57
|
header: parsedHeader,
|
|
49
58
|
};
|
|
50
59
|
} catch (e) {
|
|
51
|
-
|
|
60
|
+
const headerValue = coValueRow?.header ?? "";
|
|
61
|
+
logger.warn("Invalid JSON in header: " + headerValue, {
|
|
62
|
+
id: coValueId,
|
|
63
|
+
});
|
|
52
64
|
return;
|
|
53
65
|
}
|
|
54
66
|
}
|
|
@@ -75,7 +87,7 @@ export class SQLiteClient implements DBClientInterface {
|
|
|
75
87
|
tx: JSON.parse(transactionRow.tx) as Transaction,
|
|
76
88
|
}));
|
|
77
89
|
} catch (e) {
|
|
78
|
-
|
|
90
|
+
logger.warn("Invalid JSON in transaction");
|
|
79
91
|
return [];
|
|
80
92
|
}
|
|
81
93
|
}
|
package/src/sqliteNode.ts
CHANGED
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
OutgoingSyncQueue,
|
|
5
5
|
Peer,
|
|
6
6
|
cojsonInternals,
|
|
7
|
+
logger,
|
|
7
8
|
} from "cojson";
|
|
8
9
|
import { SyncManager, TransactionRow } from "cojson-storage";
|
|
9
10
|
import { SQLiteClient } from "./sqliteClient.js";
|
|
@@ -40,24 +41,21 @@ export class SQLiteNode {
|
|
|
40
41
|
await new Promise((resolve) => setTimeout(resolve, 0));
|
|
41
42
|
}
|
|
42
43
|
} catch (e) {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
)}`,
|
|
52
|
-
{ cause: e },
|
|
53
|
-
),
|
|
44
|
+
logger.error(
|
|
45
|
+
`Error reading from localNode, handling msg\n\n${JSON.stringify(
|
|
46
|
+
msg,
|
|
47
|
+
(k, v) =>
|
|
48
|
+
k === "changes" || k === "encryptedChanges"
|
|
49
|
+
? v.slice(0, 20) + "..."
|
|
50
|
+
: v,
|
|
51
|
+
)}`,
|
|
54
52
|
);
|
|
55
53
|
}
|
|
56
54
|
}
|
|
57
55
|
};
|
|
58
56
|
|
|
59
57
|
processMessages().catch((e) =>
|
|
60
|
-
|
|
58
|
+
logger.error("Error in processMessages in sqlite", e),
|
|
61
59
|
);
|
|
62
60
|
}
|
|
63
61
|
|
|
@@ -97,10 +95,7 @@ export class SQLiteNode {
|
|
|
97
95
|
db.pragma("user_version") as [{ user_version: number }]
|
|
98
96
|
)[0].user_version as number;
|
|
99
97
|
|
|
100
|
-
console.log("DB version", oldVersion);
|
|
101
|
-
|
|
102
98
|
if (oldVersion === 0) {
|
|
103
|
-
console.log("Migration 0 -> 1: Basic schema");
|
|
104
99
|
db.prepare(
|
|
105
100
|
`CREATE TABLE IF NOT EXISTS transactions (
|
|
106
101
|
ses INTEGER,
|
|
@@ -138,15 +133,10 @@ export class SQLiteNode {
|
|
|
138
133
|
).run();
|
|
139
134
|
|
|
140
135
|
db.pragma("user_version = 1");
|
|
141
|
-
console.log("Migration 0 -> 1: Basic schema - done");
|
|
142
136
|
}
|
|
143
137
|
|
|
144
138
|
if (oldVersion <= 1) {
|
|
145
139
|
// fix embarrassing off-by-one error for transaction indices
|
|
146
|
-
console.log(
|
|
147
|
-
"Migration 1 -> 2: Fix off-by-one error for transaction indices",
|
|
148
|
-
);
|
|
149
|
-
|
|
150
140
|
const txs = db
|
|
151
141
|
.prepare(`SELECT * FROM transactions`)
|
|
152
142
|
.all() as TransactionRow[];
|
|
@@ -163,14 +153,9 @@ export class SQLiteNode {
|
|
|
163
153
|
}
|
|
164
154
|
|
|
165
155
|
db.pragma("user_version = 2");
|
|
166
|
-
console.log(
|
|
167
|
-
"Migration 1 -> 2: Fix off-by-one error for transaction indices - done",
|
|
168
|
-
);
|
|
169
156
|
}
|
|
170
157
|
|
|
171
158
|
if (oldVersion <= 2) {
|
|
172
|
-
console.log("Migration 2 -> 3: Add signatureAfter");
|
|
173
|
-
|
|
174
159
|
db.prepare(
|
|
175
160
|
`CREATE TABLE IF NOT EXISTS signatureAfter (
|
|
176
161
|
ses INTEGER,
|
|
@@ -185,7 +170,6 @@ export class SQLiteNode {
|
|
|
185
170
|
).run();
|
|
186
171
|
|
|
187
172
|
db.pragma("user_version = 3");
|
|
188
|
-
console.log("Migration 2 -> 3: Add signatureAfter - done!!");
|
|
189
173
|
}
|
|
190
174
|
|
|
191
175
|
return new SQLiteNode(db, fromLocalNode, toLocalNode);
|