@syncular/relay 0.0.2-128 → 0.0.2-133

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.
Files changed (5) hide show
  1. package/dist/server-role/push.d.ts.map +1 -1
  2. package/dist/server-role/push.js +35 -7
  3. package/dist/server-role/push.js.map +1 -1
  4. package/package.json +4 -4
  5. package/src/server-role/push.ts +42 -7
package/dist/server-role/push.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../src/server-role/push.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,KAAK,gBAAgB,EAAc,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,KAAK,MAAM,EAAO,MAAM,QAAQ,CAAC;AAC1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE/C;;;;;;;GAOG;AACH,wBAAsB,eAAe,CACnC,EAAE,SAAS,aAAa,GAAG,aAAa,EACxC,IAAI,EAAE;IACN,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACf,OAAO,EAAE,iBAAiB,CAAC;IAC3B,QAAQ,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,eAAe,CAAC;CAC1B,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA8B5B"}
1
+ {"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../src/server-role/push.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,KAAK,gBAAgB,EAAc,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,KAAK,MAAM,EAAO,MAAM,QAAQ,CAAC;AAC1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE/C;;;;;;;GAOG;AACH,wBAAsB,eAAe,CACnC,EAAE,SAAS,aAAa,GAAG,aAAa,EACxC,IAAI,EAAE;IACN,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACf,OAAO,EAAE,iBAAiB,CAAC;IAC3B,QAAQ,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,eAAe,CAAC;CAC1B,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAmC5B"}
package/dist/server-role/push.js CHANGED
@@ -30,13 +30,19 @@ export async function relayPushCommit(args) {
30
30
  if (result.response.ok === true &&
31
31
  result.response.status === 'applied' &&
32
32
  typeof result.response.commitSeq === 'number') {
33
- await enqueueForForwarding(trx, {
34
- localCommitSeq: result.response.commitSeq,
35
- clientId: request.clientId,
36
- clientCommitId: request.clientCommitId,
37
- operations: request.operations,
38
- schemaVersion: request.schemaVersion,
39
- });
33
+ try {
34
+ await enqueueForForwarding(trx, {
35
+ localCommitSeq: result.response.commitSeq,
36
+ clientId: request.clientId,
37
+ clientCommitId: request.clientCommitId,
38
+ operations: request.operations,
39
+ schemaVersion: request.schemaVersion,
40
+ });
41
+ }
42
+ catch (error) {
43
+ await rollbackLocalCommit(trx, result.response.commitSeq);
44
+ throw error;
45
+ }
40
46
  }
41
47
  return result;
42
48
  });
@@ -91,4 +97,26 @@ async function enqueueForForwarding(db, args) {
91
97
  on conflict (local_commit_seq) do nothing
92
98
  `.execute(db);
93
99
  }
100
+ async function rollbackLocalCommit(db, commitSeq) {
101
+ await sql `
102
+ delete from ${sql.table('relay_sequence_map')}
103
+ where ${sql.ref('local_commit_seq')} = ${commitSeq}
104
+ `.execute(db);
105
+ await sql `
106
+ delete from ${sql.table('relay_forward_outbox')}
107
+ where ${sql.ref('local_commit_seq')} = ${commitSeq}
108
+ `.execute(db);
109
+ await sql `
110
+ delete from ${sql.table('sync_table_commits')}
111
+ where ${sql.ref('commit_seq')} = ${commitSeq}
112
+ `.execute(db);
113
+ await sql `
114
+ delete from ${sql.table('sync_changes')}
115
+ where ${sql.ref('commit_seq')} = ${commitSeq}
116
+ `.execute(db);
117
+ await sql `
118
+ delete from ${sql.table('sync_commits')}
119
+ where ${sql.ref('commit_seq')} = ${commitSeq}
120
+ `.execute(db);
121
+ }
94
122
  //# sourceMappingURL=push.js.map
package/dist/server-role/push.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"push.js","sourceRoot":"","sources":["../../src/server-role/push.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAyB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAe,GAAG,EAAE,MAAM,QAAQ,CAAC;AAG1C;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAEnC,IAMD,EAA6B;IAC5B,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAEzB,OAAO,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC;QAClD,2EAA2E;QAC3E,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC;YAC9B,EAAE,EAAE,GAAG;YACP,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,OAAO;SACR,CAAC,CAAC;QAEH,sEAAsE;QACtE,IACE,MAAM,CAAC,QAAQ,CAAC,EAAE,KAAK,IAAI;YAC3B,MAAM,CAAC,QAAQ,CAAC,MAAM,KAAK,SAAS;YACpC,OAAO,MAAM,CAAC,QAAQ,CAAC,SAAS,KAAK,QAAQ,EAC7C,CAAC;YACD,MAAM,oBAAoB,CAAC,GAAG,EAAE;gBAC9B,cAAc,EAAE,MAAM,CAAC,QAAQ,CAAC,SAAS;gBACzC,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,aAAa,EAAE,OAAO,CAAC,aAAa;aACrC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,MAAM,CAAC;IAAA,CACf,CAAC,CAAC;AAAA,CACJ;AAED;;GAEG;AACH,KAAK,UAAU,oBAAoB,CACjC,EAAc,EACd,IAMC,EACc;IACf,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAEvB,MAAM,GAAG,CAAA;kBACO,GAAG,CAAC,KAAK,CAAC,sBAAsB,CAAC;;;;;;;;;;;;;;;;QAgB3C,QAAQ,EAAE;QACV,IAAI,CAAC,cAAc;QACnB,IAAI,CAAC,QAAQ;QACb,IAAI,CAAC,cAAc;QACnB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;QAC/B,IAAI,CAAC,aAAa;;QAElB,IAAI;QACJ,IAAI;QACJ,IAAI;QACJ,GAAG;QACH,GAAG;QACH,CAAC;;GAEN,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAEd,mDAAmD;IACnD,MAAM,GAAG,CAAA;kBACO,GAAG,CAAC,KAAK,CAAC,oBAAoB,CAAC;;;;;;;cAOnC,IAAI,CAAC,cAAc,KAAK,IAAI,gBAAgB,GAAG,KAAK,GAAG;;GAElE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAAA,CACf"}
1
+ {"version":3,"file":"push.js","sourceRoot":"","sources":["../../src/server-role/push.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@syncular/relay",
3
- "version": "0.0.2-128",
3
+ "version": "0.0.2-133",
4
4
  "description": "Edge relay for Syncular distributed sync",
5
5
  "license": "MIT",
6
6
  "author": "Benjamin Kniffler",
@@ -42,8 +42,8 @@
42
42
  "release": "bunx syncular-publish"
43
43
  },
44
44
  "dependencies": {
45
- "@syncular/core": "0.0.2-128",
46
- "@syncular/server": "0.0.2-128"
45
+ "@syncular/core": "0.0.2-133",
46
+ "@syncular/server": "0.0.2-133"
47
47
  },
48
48
  "peerDependencies": {
49
49
  "hono": "^4.0.0",
@@ -51,7 +51,7 @@
51
51
  },
52
52
  "devDependencies": {
53
53
  "@syncular/config": "0.0.0",
54
- "@syncular/server-dialect-sqlite": "0.0.2-128",
54
+ "@syncular/server-dialect-sqlite": "0.0.2-133",
55
55
  "kysely": "*"
56
56
  },
57
57
  "files": [
package/src/server-role/push.ts CHANGED
@@ -47,13 +47,18 @@ export async function relayPushCommit<
47
47
  result.response.status === 'applied' &&
48
48
  typeof result.response.commitSeq === 'number'
49
49
  ) {
50
- await enqueueForForwarding(trx, {
51
- localCommitSeq: result.response.commitSeq,
52
- clientId: request.clientId,
53
- clientCommitId: request.clientCommitId,
54
- operations: request.operations,
55
- schemaVersion: request.schemaVersion,
56
- });
50
+ try {
51
+ await enqueueForForwarding(trx, {
52
+ localCommitSeq: result.response.commitSeq,
53
+ clientId: request.clientId,
54
+ clientCommitId: request.clientCommitId,
55
+ operations: request.operations,
56
+ schemaVersion: request.schemaVersion,
57
+ });
58
+ } catch (error) {
59
+ await rollbackLocalCommit(trx, result.response.commitSeq);
60
+ throw error;
61
+ }
57
62
  }
58
63
 
59
64
  return result;
@@ -121,3 +126,33 @@ async function enqueueForForwarding<DB extends RelayDatabase>(
121
126
  on conflict (local_commit_seq) do nothing
122
127
  `.execute(db);
123
128
  }
129
+
130
+ async function rollbackLocalCommit<DB extends RelayDatabase>(
131
+ db: Kysely<DB>,
132
+ commitSeq: number
133
+ ): Promise<void> {
134
+ await sql`
135
+ delete from ${sql.table('relay_sequence_map')}
136
+ where ${sql.ref('local_commit_seq')} = ${commitSeq}
137
+ `.execute(db);
138
+
139
+ await sql`
140
+ delete from ${sql.table('relay_forward_outbox')}
141
+ where ${sql.ref('local_commit_seq')} = ${commitSeq}
142
+ `.execute(db);
143
+
144
+ await sql`
145
+ delete from ${sql.table('sync_table_commits')}
146
+ where ${sql.ref('commit_seq')} = ${commitSeq}
147
+ `.execute(db);
148
+
149
+ await sql`
150
+ delete from ${sql.table('sync_changes')}
151
+ where ${sql.ref('commit_seq')} = ${commitSeq}
152
+ `.execute(db);
153
+
154
+ await sql`
155
+ delete from ${sql.table('sync_commits')}
156
+ where ${sql.ref('commit_seq')} = ${commitSeq}
157
+ `.execute(db);
158
+ }