document-drive 6.0.0-dev.27 → 6.0.0-dev.29
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/dist/src/cache/lru.js +1 -1
- package/dist/src/cache/lru.js.map +1 -1
- package/dist/src/processors/processor-manager.d.ts.map +1 -1
- package/dist/src/processors/processor-manager.js +5 -5
- package/dist/src/processors/processor-manager.js.map +1 -1
- package/dist/src/queue/event.js +9 -9
- package/dist/src/queue/event.js.map +1 -1
- package/dist/src/read-mode/server.js +2 -2
- package/dist/src/read-mode/server.js.map +1 -1
- package/dist/src/server/base-server.d.ts.map +1 -1
- package/dist/src/server/base-server.js +54 -40
- package/dist/src/server/base-server.js.map +1 -1
- package/dist/src/server/listener/listener-manager.d.ts.map +1 -1
- package/dist/src/server/listener/listener-manager.js +32 -32
- package/dist/src/server/listener/listener-manager.js.map +1 -1
- package/dist/src/server/sync-manager.d.ts.map +1 -1
- package/dist/src/server/sync-manager.js +10 -13
- package/dist/src/server/sync-manager.js.map +1 -1
- package/dist/src/server/transmitter/internal.js +1 -1
- package/dist/src/server/transmitter/internal.js.map +1 -1
- package/dist/src/server/transmitter/pull-responder.d.ts.map +1 -1
- package/dist/src/server/transmitter/pull-responder.js +42 -42
- package/dist/src/server/transmitter/pull-responder.js.map +1 -1
- package/dist/src/server/transmitter/switchboard-push.d.ts.map +1 -1
- package/dist/src/server/transmitter/switchboard-push.js +7 -7
- package/dist/src/server/transmitter/switchboard-push.js.map +1 -1
- package/dist/src/storage/browser.js +1 -1
- package/dist/src/storage/browser.js.map +1 -1
- package/dist/src/storage/filesystem.js +1 -1
- package/dist/src/storage/filesystem.js.map +1 -1
- package/dist/src/storage/memory.js +1 -1
- package/dist/src/storage/memory.js.map +1 -1
- package/dist/src/storage/prisma/prisma.d.ts.map +1 -1
- package/dist/src/storage/prisma/prisma.js +6 -5
- package/dist/src/storage/prisma/prisma.js.map +1 -1
- package/dist/src/utils/default-drives-manager.js +2 -2
- package/dist/src/utils/default-drives-manager.js.map +1 -1
- package/dist/src/utils/graphql.js +2 -2
- package/dist/src/utils/graphql.js.map +1 -1
- package/dist/src/utils/logger.d.ts +2 -20
- package/dist/src/utils/logger.d.ts.map +1 -1
- package/dist/src/utils/logger.js +1 -106
- package/dist/src/utils/logger.js.map +1 -1
- package/dist/src/utils/types.d.ts +1 -7
- package/dist/src/utils/types.d.ts.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -4
package/dist/src/cache/lru.js
CHANGED
|
@@ -21,7 +21,7 @@ export class LRUCacheStorage {
|
|
|
21
21
|
maxSize,
|
|
22
22
|
sizeCalculation,
|
|
23
23
|
});
|
|
24
|
-
this.logger.info(
|
|
24
|
+
this.logger.info("Created LRUCache with maxSize: @maxSize bytes", maxSize);
|
|
25
25
|
}
|
|
26
26
|
get(key) {
|
|
27
27
|
return this.cache.get(key);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lru.js","sourceRoot":"","sources":["../../../src/cache/lru.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE1D,OAAO,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,MAAM,MAAM,eAAe,CAAC;AAEnC;;;;;;;;;;GAUG;AAEH,MAAM,OAAO,eAAe;IAClB,KAAK,CAA0B;IAC/B,MAAM,GAAG,WAAW,CAAC,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;IAEpD,YAAY,OAA+B;QACzC,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC;QACtD,IAAI,CAAC,KAAK,GAAG,IAAI,YAAY,CAAgB;YAC3C,OAAO;YACP,eAAe;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"lru.js","sourceRoot":"","sources":["../../../src/cache/lru.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE1D,OAAO,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,MAAM,MAAM,eAAe,CAAC;AAEnC;;;;;;;;;;GAUG;AAEH,MAAM,OAAO,eAAe;IAClB,KAAK,CAA0B;IAC/B,MAAM,GAAG,WAAW,CAAC,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;IAEpD,YAAY,OAA+B;QACzC,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC;QACtD,IAAI,CAAC,KAAK,GAAG,IAAI,YAAY,CAAgB;YAC3C,OAAO;YACP,eAAe;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+CAA+C,EAAE,OAAO,CAAC,CAAC;IAC7E,CAAC;IAED,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IACD,GAAG,CAAC,GAAW,EAAE,KAAY;QAC3B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,CAAC,GAAW;QAChB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IACD,KAAK;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processor-manager.d.ts","sourceRoot":"","sources":["../../../src/processors/processor-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAGjB,MAAM,gBAAgB,CAAC;AAMxB,qBAAa,gBAAiB,YAAW,iBAAiB;IAWtD,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,KAAK;IAXf,OAAO,CAAC,QAAQ,CAAC,MAAM,CAGpB;IAEH,OAAO,CAAC,iBAAiB,CAAwC;IACjE,OAAO,CAAC,WAAW,CAAuC;IAC1D,OAAO,CAAC,qBAAqB,CAAuC;gBAG1D,SAAS,EAAE,gBAAgB,EAC3B,KAAK,EAAE,oBAAoB;IAK/B,eAAe,CACnB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,IAAI,CAAC;IAYV,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBpD,aAAa,CAAC,OAAO,EAAE,MAAM;IASnC;;;;;OAKG;IACG,gBAAgB,CACpB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,gBAAgB;
|
|
1
|
+
{"version":3,"file":"processor-manager.d.ts","sourceRoot":"","sources":["../../../src/processors/processor-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAGjB,MAAM,gBAAgB,CAAC;AAMxB,qBAAa,gBAAiB,YAAW,iBAAiB;IAWtD,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,KAAK;IAXf,OAAO,CAAC,QAAQ,CAAC,MAAM,CAGpB;IAEH,OAAO,CAAC,iBAAiB,CAAwC;IACjE,OAAO,CAAC,WAAW,CAAuC;IAC1D,OAAO,CAAC,qBAAqB,CAAuC;gBAG1D,SAAS,EAAE,gBAAgB,EAC3B,KAAK,EAAE,oBAAoB;IAK/B,eAAe,CACnB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,IAAI,CAAC;IAYV,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBpD,aAAa,CAAC,OAAO,EAAE,MAAM;IASnC;;;;;OAKG;IACG,gBAAgB,CACpB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,gBAAgB;CAsE5B"}
|
|
@@ -18,7 +18,7 @@ export class ProcessorManager {
|
|
|
18
18
|
//
|
|
19
19
|
}
|
|
20
20
|
async registerFactory(identifier, factory) {
|
|
21
|
-
this.logger.debug(
|
|
21
|
+
this.logger.debug("Registering factory '@identifier'.", identifier);
|
|
22
22
|
this.idToFactory.set(identifier, factory);
|
|
23
23
|
// iterate over all drives and register the factory
|
|
24
24
|
const driveIds = await this.drive.getDrives();
|
|
@@ -32,7 +32,7 @@ export class ProcessorManager {
|
|
|
32
32
|
for (const listener of listeners) {
|
|
33
33
|
await this.listeners
|
|
34
34
|
.removeListener(listener.driveId, listener.listenerId)
|
|
35
|
-
.catch(this.logger.error);
|
|
35
|
+
.catch((e) => this.logger.error("@error", e));
|
|
36
36
|
if (listener.transmitter?.disconnect) {
|
|
37
37
|
await listener.transmitter.disconnect();
|
|
38
38
|
}
|
|
@@ -40,7 +40,7 @@ export class ProcessorManager {
|
|
|
40
40
|
this.identifierToListeners.set(identifier, []);
|
|
41
41
|
}
|
|
42
42
|
async registerDrive(driveId) {
|
|
43
|
-
this.logger.debug(
|
|
43
|
+
this.logger.debug("Registering drive '@driveId'.", driveId);
|
|
44
44
|
// iterate over all factories and create listeners
|
|
45
45
|
for (const [identifier, factory] of this.idToFactory) {
|
|
46
46
|
await this.createProcessors(driveId, identifier, factory);
|
|
@@ -70,7 +70,7 @@ export class ProcessorManager {
|
|
|
70
70
|
processors = await factory(drive.header);
|
|
71
71
|
}
|
|
72
72
|
catch (e) {
|
|
73
|
-
this.logger.error(
|
|
73
|
+
this.logger.error("Error creating processors for drive @driveId: @error", driveId, e);
|
|
74
74
|
return;
|
|
75
75
|
}
|
|
76
76
|
for (const { filter, processor } of processors) {
|
|
@@ -79,7 +79,7 @@ export class ProcessorManager {
|
|
|
79
79
|
if (isRelational &&
|
|
80
80
|
driveProcessors.some((p) => isRelationalDbProcessor(p.processor) &&
|
|
81
81
|
p.processor.namespace === processor.namespace)) {
|
|
82
|
-
this.logger.debug(
|
|
82
|
+
this.logger.debug("Processor with namespace '@namespace' already registered for drive '@driveId'.", processor.namespace, driveId);
|
|
83
83
|
continue;
|
|
84
84
|
}
|
|
85
85
|
if (isRelational) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processor-manager.js","sourceRoot":"","sources":["../../../src/processors/processor-manager.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AACjF,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAE1D,MAAM,OAAO,gBAAgB;IAWjB;IACA;IAXO,MAAM,GAAG,WAAW,CAAC;QACpC,gBAAgB;QAChB,mBAAmB;KACpB,CAAC,CAAC;IAEK,iBAAiB,GAAG,IAAI,GAAG,EAA6B,CAAC;IACzD,WAAW,GAAG,IAAI,GAAG,EAA4B,CAAC;IAClD,qBAAqB,GAAG,IAAI,GAAG,EAA4B,CAAC;IAEpE,YACU,SAA2B,EAC3B,KAA2B;QAD3B,cAAS,GAAT,SAAS,CAAkB;QAC3B,UAAK,GAAL,KAAK,CAAsB;QAEnC,EAAE;IACJ,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,UAAkB,EAClB,OAAyB;QAEzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"processor-manager.js","sourceRoot":"","sources":["../../../src/processors/processor-manager.ts"],"names":[],"mappings":"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"}
|
package/dist/src/queue/event.js
CHANGED
|
@@ -36,20 +36,20 @@ export class EventQueueManager {
|
|
|
36
36
|
});
|
|
37
37
|
}
|
|
38
38
|
this.emitter.on("jobAdded", wrapErrorHandler(async (job) => {
|
|
39
|
-
this.logger.verbose("Added job", job);
|
|
39
|
+
this.logger.verbose("Added job: @job", job);
|
|
40
40
|
await this.processNextJob();
|
|
41
41
|
}));
|
|
42
42
|
this.emitter.on("jobStarted", wrapErrorHandler(async (job) => {
|
|
43
|
-
this.logger.verbose("Started job", job.jobId);
|
|
43
|
+
this.logger.verbose("Started job: @jobId", job.jobId);
|
|
44
44
|
this.runningJobs.push(job);
|
|
45
45
|
await this.processNextJob();
|
|
46
46
|
}));
|
|
47
47
|
this.emitter.on("jobCompleted", wrapErrorHandler(async (job, result) => {
|
|
48
|
-
this.logger.verbose("Completed job", job.jobId);
|
|
48
|
+
this.logger.verbose("Completed job: @jobId", job.jobId);
|
|
49
49
|
await this.handleJobCompleted(job, result);
|
|
50
50
|
}));
|
|
51
51
|
this.emitter.on("jobFailed", wrapErrorHandler(async (job, error) => {
|
|
52
|
-
this.logger.error("Failed job", job, error);
|
|
52
|
+
this.logger.error("Failed job: @job @error", job, error);
|
|
53
53
|
this.removeJob(job);
|
|
54
54
|
onError(error);
|
|
55
55
|
await this.processNextJob();
|
|
@@ -129,12 +129,12 @@ export class EventQueueManager {
|
|
|
129
129
|
removeJob(job) {
|
|
130
130
|
const indexRunning = this.runningJobs.findIndex((j) => j.jobId === job.jobId);
|
|
131
131
|
if (indexRunning === -1) {
|
|
132
|
-
this.logger.warn("Running job not found", job.jobId);
|
|
132
|
+
this.logger.warn("Running job not found: @jobId", job.jobId);
|
|
133
133
|
}
|
|
134
134
|
this.runningJobs.splice(indexRunning, 1);
|
|
135
135
|
const indexGlobal = this.globalQueue.findIndex((j) => j.jobId === job.jobId);
|
|
136
136
|
if (indexGlobal === -1) {
|
|
137
|
-
this.logger.warn("Job not found on global queue", job.jobId);
|
|
137
|
+
this.logger.warn("Job not found on global queue: @jobId", job.jobId);
|
|
138
138
|
}
|
|
139
139
|
this.globalQueue.splice(indexGlobal, 1);
|
|
140
140
|
}
|
|
@@ -171,7 +171,7 @@ export class EventQueueManager {
|
|
|
171
171
|
job = queueJob?.job;
|
|
172
172
|
}
|
|
173
173
|
catch (error) {
|
|
174
|
-
logger.error("Error finding next job", error);
|
|
174
|
+
logger.error("Error finding next job: @error", error);
|
|
175
175
|
}
|
|
176
176
|
if (!queue || !job) {
|
|
177
177
|
this.workers--;
|
|
@@ -188,7 +188,7 @@ export class EventQueueManager {
|
|
|
188
188
|
this.emit("jobCompleted", job, result);
|
|
189
189
|
}
|
|
190
190
|
catch (error) {
|
|
191
|
-
logger.error("Job failed", error);
|
|
191
|
+
logger.error("Job failed: @error", error);
|
|
192
192
|
this.workers--;
|
|
193
193
|
this.isFindingJob = false;
|
|
194
194
|
await queue.setRunning(false);
|
|
@@ -210,7 +210,7 @@ export class EventQueueManager {
|
|
|
210
210
|
const queueJob = await queue.getNextJob();
|
|
211
211
|
if (queueJob?.jobId !== job.jobId) {
|
|
212
212
|
logger.warn("Queue has different job waiting to be picked up"); // TODO ensure this is not possible
|
|
213
|
-
logger.error(job, queueJob);
|
|
213
|
+
logger.error("@job @queueJob", job, queueJob);
|
|
214
214
|
continue;
|
|
215
215
|
}
|
|
216
216
|
return { queue, job: queueJob };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event.js","sourceRoot":"","sources":["../../../src/queue/event.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAW3D,MAAM,OAAO,iBAAiB;IAClB,MAAM,GAAG,WAAW,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAC5C,OAAO,GAAG,gBAAgB,EAAe,CAAC;IAC1C,MAAM,GAAG,IAAI,GAAG,EAAiC,CAAC;IAClD,WAAW,GAAG,IAAI,KAAK,EAAe,CAAC;IACvC,YAAY,GAAG,KAAK,CAAC;IACrB,UAAU,CAAS;IACnB,OAAO,CAAS;IAChB,WAAW,GAAG,IAAI,KAAK,EAAa,CAAC;IACrC,OAAO,CAAS;IAChB,QAAQ,CAA8B;IACtC,OAAO,CAAuC;IAExD,YAAY,UAAU,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC;QACrC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,IAAI,CACR,QAAyB,EACzB,OAA+B;QAE/B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,SAAS,gBAAgB,CACvB,MAAS;YAET,OAAO,CAAC,KAAK,EAAE,GAAG,IAAS,EAAE,EAAE;gBAC7B,IAAI,CAAC;oBACH,MAAM,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;gBACxB,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,KAAK,YAAY,KAAK;wBAC1B,CAAC,CAAC,KAAK;wBACP,CAAC,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;gBACvC,CAAC;YACH,CAAC,CAAM,CAAC;QACV,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,EAAE,CACb,UAAU,EACV,gBAAgB,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YAC7B,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"event.js","sourceRoot":"","sources":["../../../src/queue/event.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ export function ReadModeServer(Base) {
|
|
|
13
13
|
this.#notifyListeners(drives, "add");
|
|
14
14
|
}
|
|
15
15
|
})
|
|
16
|
-
.catch(logger.error);
|
|
16
|
+
.catch((e) => logger.error("@error", e));
|
|
17
17
|
}
|
|
18
18
|
async #buildDrives() {
|
|
19
19
|
const driveIds = await this.getReadDrives();
|
|
@@ -64,7 +64,7 @@ export function ReadModeServer(Base) {
|
|
|
64
64
|
}
|
|
65
65
|
catch (error) {
|
|
66
66
|
// if an error is thrown, then add the read drive again
|
|
67
|
-
logger.error(error);
|
|
67
|
+
logger.error("@error", error);
|
|
68
68
|
await this.addReadDrive(result.url, readOptions);
|
|
69
69
|
throw error;
|
|
70
70
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/read-mode/server.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,UAAU,cAAc,CAC5B,IAAoC;IAIpC,OAAO,MAAM,QAAS,SAAQ,IAAI;QAChC,gBAAgB,CAAwB;QACxC,UAAU,GAAG,IAAI,GAAG,EAAsB,CAAC;QAE3C,YAAY,GAAG,IAAW;YACxB,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;YAEf,IAAI,CAAC,gBAAgB,GAAG,IAAI,eAAe,CACzC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CACvC,CAAC;YAEF,IAAI,CAAC,YAAY,EAAE;iBAChB,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;gBACf,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;oBAClB,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;gBACvC,CAAC;YACH,CAAC,CAAC;iBACD,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/read-mode/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-server.d.ts","sourceRoot":"","sources":["../../../src/server/base-server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,mBAAmB,EAEnB,mBAAmB,EACnB,mBAAmB,EACnB,qBAAqB,EACrB,0BAA0B,EAE1B,WAAW,EACX,UAAU,EACV,oBAAoB,EACpB,wBAAwB,EACxB,MAAM,EACN,qBAAqB,EACrB,gBAAgB,EAChB,sBAAsB,EACtB,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,uBAAuB,EAEvB,mBAAmB,EAInB,sBAAsB,EACtB,kBAAkB,EAGlB,kBAAkB,EAElB,gCAAgC,EAChC,UAAU,EACV,oBAAoB,EAErB,MAAM,gBAAgB,CAAC;AAYxB,OAAO,KAAK,EACV,MAAM,EAEN,mBAAmB,EAEnB,kBAAkB,EAClB,SAAS,EACT,UAAU,EAEV,cAAc,EAEd,YAAY,EAEb,MAAM,gBAAgB,CAAC;AAsBxB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAQ9C,OAAO,EAGL,cAAc,EACf,MAAM,YAAY,CAAC;AAUpB,qBAAa,uBACX,YAAW,wBAAwB,EAAE,qBAAqB;IAE1D,SAAS,CAAC,MAAM,mCAA4C;IAG5D,OAAO,CAAC,oBAAoB,CAAwB;IACpD,OAAO,CAAC,aAAa,CAAyB;IAC9C,OAAO,CAAC,eAAe,CAAmB;IAC1C,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,YAAY,CAAgB;IAC7B,YAAY,EAAE,aAAa,CAAC;IACnC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,0BAA0B,CAAC,CAAC;IACxD,OAAO,CAAC,eAAe,CAAmB;IAC1C,OAAO,CAAC,sBAAsB,CAA0B;IACjD,kBAAkB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAGlE,OAAO,CAAC,oBAAoB,CAAuB;IAEnD,OAAO,CAAC,4BAA4B,CAIlC;IAEF,OAAO,CAAC,aAAa,CA+EnB;IAGF,OAAO,CAAC,UAAU,CAGd;IACJ,OAAO,CAAC,iBAAiB,CAA0B;IACnD,SAAS,CAAC,sBAAsB,EAAE,OAAO,CAAC;gBAGxC,oBAAoB,EAAE,mBAAmB,EAAE,EAC3C,OAAO,EAAE,sBAAsB,EAC/B,eAAe,EAAE,gBAAgB,EACjC,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,aAAa,EAC3B,YAAY,EAAE,aAAa,EAC3B,sBAAsB,EAAE,uBAAuB,EAC/C,eAAe,EAAE,gBAAgB,EACjC,OAAO,CAAC,EAAE,0BAA0B;IAmDtC,IAAI,SAAS,IAAI,gBAAgB,CAEhC;IAED,UAAU;YAII,WAAW;
|
|
1
|
+
{"version":3,"file":"base-server.d.ts","sourceRoot":"","sources":["../../../src/server/base-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -144,20 +144,20 @@ export class BaseDocumentDriveServer {
|
|
|
144
144
|
async _initialize() {
|
|
145
145
|
await this.listenerManager.initialize(this.handleListenerError.bind(this));
|
|
146
146
|
await this.queueManager.init(this.queueDelegate, (error) => {
|
|
147
|
-
this.logger.error(
|
|
147
|
+
this.logger.error("Error initializing queue manager: @error", error);
|
|
148
148
|
// errors.push(error);
|
|
149
149
|
});
|
|
150
150
|
try {
|
|
151
151
|
await this.defaultDrivesManager.removeOldremoteDrives();
|
|
152
152
|
}
|
|
153
153
|
catch (error) {
|
|
154
|
-
this.logger.error(error);
|
|
154
|
+
this.logger.error("@error", error);
|
|
155
155
|
}
|
|
156
156
|
const errors = [];
|
|
157
157
|
const drives = await this.getDrives();
|
|
158
158
|
for (const drive of drives) {
|
|
159
159
|
await this._initializeDrive(drive).catch((error) => {
|
|
160
|
-
this.logger.error(
|
|
160
|
+
this.logger.error("Error initializing drive @drive: @error", drive, error);
|
|
161
161
|
errors.push(error);
|
|
162
162
|
});
|
|
163
163
|
}
|
|
@@ -187,7 +187,7 @@ export class BaseDocumentDriveServer {
|
|
|
187
187
|
return source.type === "local" ? "push" : "pull";
|
|
188
188
|
}
|
|
189
189
|
handleListenerError(error, driveId, listener) {
|
|
190
|
-
this.logger.error(
|
|
190
|
+
this.logger.error("Listener @listenerId error: @error", listener.listener.label ?? listener.listener.listenerId, error);
|
|
191
191
|
const status = error instanceof OperationError ? error.status : "ERROR";
|
|
192
192
|
this.synchronizationManager.updateSyncStatus(driveId, { push: status }, error);
|
|
193
193
|
}
|
|
@@ -257,7 +257,7 @@ export class BaseDocumentDriveServer {
|
|
|
257
257
|
const { documentId, scope, branch } = revision;
|
|
258
258
|
this.listenerManager
|
|
259
259
|
.updateListenerRevision(pushListener.listenerId, driveId, { documentId, scope, branch }, revision.revision)
|
|
260
|
-
.catch(this.logger.error);
|
|
260
|
+
.catch((e) => this.logger.error("@error", e));
|
|
261
261
|
}
|
|
262
262
|
}
|
|
263
263
|
}
|
|
@@ -279,19 +279,19 @@ export class BaseDocumentDriveServer {
|
|
|
279
279
|
}
|
|
280
280
|
async _initializeDrive(driveId) {
|
|
281
281
|
const drive = await this.getDrive(driveId);
|
|
282
|
-
this.logger.verbose(
|
|
282
|
+
this.logger.verbose('[SYNC DEBUG] Initializing drive @driveId with slug "@slug"', driveId, drive.header.slug);
|
|
283
283
|
await this.synchronizationManager.initializeDriveSyncStatus(driveId, drive);
|
|
284
284
|
if (this.shouldSyncRemoteDrive(drive)) {
|
|
285
|
-
this.logger.verbose(
|
|
285
|
+
this.logger.verbose("[SYNC DEBUG] Starting sync for remote drive @driveId", driveId);
|
|
286
286
|
await this.startSyncRemoteDrive(driveId);
|
|
287
287
|
}
|
|
288
288
|
// add switchboard push listeners
|
|
289
|
-
this.logger.verbose(
|
|
289
|
+
this.logger.verbose("[SYNC DEBUG] Processing @count listeners for drive @driveId", drive.state.local.listeners.length, driveId);
|
|
290
290
|
for (const zodListener of drive.state.local.listeners) {
|
|
291
291
|
if (zodListener.callInfo?.transmitterType === "SwitchboardPush") {
|
|
292
|
-
this.logger.verbose(
|
|
292
|
+
this.logger.verbose("[SYNC DEBUG] Setting up SwitchboardPush listener @listenerId for drive @driveId", zodListener.listenerId, driveId);
|
|
293
293
|
const transmitter = new SwitchboardPushTransmitter(zodListener.callInfo.data ?? "", this.listeners);
|
|
294
|
-
this.logger.verbose(
|
|
294
|
+
this.logger.verbose("[SYNC DEBUG] Created SwitchboardPush transmitter with URL: @url", zodListener.callInfo.data || "none");
|
|
295
295
|
await this.listenerManager
|
|
296
296
|
.setListener(driveId, {
|
|
297
297
|
block: zodListener.block,
|
|
@@ -309,11 +309,11 @@ export class BaseDocumentDriveServer {
|
|
|
309
309
|
transmitter,
|
|
310
310
|
})
|
|
311
311
|
.then(() => {
|
|
312
|
-
this.logger.verbose(
|
|
312
|
+
this.logger.verbose("[SYNC DEBUG] Successfully set up listener @listenerId for drive @driveId", zodListener.listenerId, driveId);
|
|
313
313
|
});
|
|
314
314
|
}
|
|
315
315
|
else if (zodListener.callInfo?.transmitterType === "PullResponder") {
|
|
316
|
-
this.logger.verbose(
|
|
316
|
+
this.logger.verbose("[SYNC DEBUG] Setting up PullResponder listener @listenerId for drive @driveId", zodListener.listenerId, driveId);
|
|
317
317
|
const pullResponderListener = {
|
|
318
318
|
driveId,
|
|
319
319
|
listenerId: zodListener.listenerId,
|
|
@@ -332,7 +332,7 @@ export class BaseDocumentDriveServer {
|
|
|
332
332
|
await this.listenerManager.setListener(driveId, pullResponderListener);
|
|
333
333
|
}
|
|
334
334
|
else {
|
|
335
|
-
this.logger.error(
|
|
335
|
+
this.logger.error("Skipping listener @listenerId with unsupported type @transmitterType", zodListener.listenerId, zodListener.callInfo?.transmitterType || "unknown");
|
|
336
336
|
}
|
|
337
337
|
}
|
|
338
338
|
}
|
|
@@ -460,7 +460,7 @@ export class BaseDocumentDriveServer {
|
|
|
460
460
|
}
|
|
461
461
|
}
|
|
462
462
|
catch (e) {
|
|
463
|
-
this.logger.error("Error getting drive from cache", e);
|
|
463
|
+
this.logger.error("Error getting drive from cache: @error", e);
|
|
464
464
|
}
|
|
465
465
|
const driveStorage = document ?? (await this.documentStorage.get(driveId));
|
|
466
466
|
const result = this._buildDocument(driveStorage, options);
|
|
@@ -469,8 +469,12 @@ export class BaseDocumentDriveServer {
|
|
|
469
469
|
}
|
|
470
470
|
else {
|
|
471
471
|
if (!options?.revisions) {
|
|
472
|
-
this.cache
|
|
473
|
-
|
|
472
|
+
this.cache
|
|
473
|
+
.setDocument(driveId, result)
|
|
474
|
+
.catch((e) => this.logger.error("@error", e));
|
|
475
|
+
this.cache
|
|
476
|
+
.setDrive(driveId, result)
|
|
477
|
+
.catch((e) => this.logger.error("@error", e));
|
|
474
478
|
}
|
|
475
479
|
return result;
|
|
476
480
|
}
|
|
@@ -483,7 +487,7 @@ export class BaseDocumentDriveServer {
|
|
|
483
487
|
}
|
|
484
488
|
}
|
|
485
489
|
catch (e) {
|
|
486
|
-
this.logger.error("Error getting drive from cache", e);
|
|
490
|
+
this.logger.error("Error getting drive from cache: @error", e);
|
|
487
491
|
}
|
|
488
492
|
const driveStorage = await this.documentStorage.getBySlug(slug);
|
|
489
493
|
const document = this._buildDocument(driveStorage, options);
|
|
@@ -491,7 +495,9 @@ export class BaseDocumentDriveServer {
|
|
|
491
495
|
throw new Error(`Document with slug ${slug} is not a Document Drive`);
|
|
492
496
|
}
|
|
493
497
|
else {
|
|
494
|
-
this.cache
|
|
498
|
+
this.cache
|
|
499
|
+
.setDriveBySlug(slug, document)
|
|
500
|
+
.catch((e) => this.logger.error("@error", e));
|
|
495
501
|
return document;
|
|
496
502
|
}
|
|
497
503
|
}
|
|
@@ -503,7 +509,7 @@ export class BaseDocumentDriveServer {
|
|
|
503
509
|
}
|
|
504
510
|
}
|
|
505
511
|
catch (e) {
|
|
506
|
-
this.logger.error("Error getting drive from cache", e);
|
|
512
|
+
this.logger.error("Error getting drive from cache: @error", e);
|
|
507
513
|
}
|
|
508
514
|
const driveStorage = await this.documentStorage.getBySlug(slug);
|
|
509
515
|
return driveStorage.header.id;
|
|
@@ -522,12 +528,14 @@ export class BaseDocumentDriveServer {
|
|
|
522
528
|
}
|
|
523
529
|
}
|
|
524
530
|
catch (e) {
|
|
525
|
-
this.logger.error("Error getting document from cache", e);
|
|
531
|
+
this.logger.error("Error getting document from cache: @error", e);
|
|
526
532
|
}
|
|
527
533
|
const documentStorage = cachedDocument ?? (await this.documentStorage.get(documentId));
|
|
528
534
|
const document = this._buildDocument(documentStorage, options);
|
|
529
535
|
if (!options?.revisions) {
|
|
530
|
-
this.cache
|
|
536
|
+
this.cache
|
|
537
|
+
.setDocument(documentId, document)
|
|
538
|
+
.catch((e) => this.logger.error("@error", e));
|
|
531
539
|
}
|
|
532
540
|
return document;
|
|
533
541
|
}
|
|
@@ -541,7 +549,7 @@ export class BaseDocumentDriveServer {
|
|
|
541
549
|
// TODO: update listener manager?
|
|
542
550
|
}
|
|
543
551
|
catch (e) {
|
|
544
|
-
this.logger.error("Error adding child document", e);
|
|
552
|
+
this.logger.error("Error adding child document: @error", e);
|
|
545
553
|
throw e;
|
|
546
554
|
}
|
|
547
555
|
}
|
|
@@ -555,14 +563,14 @@ export class BaseDocumentDriveServer {
|
|
|
555
563
|
await this.listenerManager.removeSyncUnits(parentId, childSynUnits);
|
|
556
564
|
}
|
|
557
565
|
catch (e) {
|
|
558
|
-
this.logger.warn("Error removing sync units of child", e);
|
|
566
|
+
this.logger.warn("Error removing sync units of child: @error", e);
|
|
559
567
|
}
|
|
560
568
|
// remove child relationship from storage
|
|
561
569
|
try {
|
|
562
570
|
await this.documentStorage.removeChild(parentId, documentId);
|
|
563
571
|
}
|
|
564
572
|
catch (e) {
|
|
565
|
-
this.logger.error("Error adding child document", e);
|
|
573
|
+
this.logger.error("Error adding child document: @error", e);
|
|
566
574
|
throw e;
|
|
567
575
|
}
|
|
568
576
|
}
|
|
@@ -869,7 +877,7 @@ export class BaseDocumentDriveServer {
|
|
|
869
877
|
}
|
|
870
878
|
}
|
|
871
879
|
catch (error) {
|
|
872
|
-
this.logger.warn("Error deleting document", error);
|
|
880
|
+
this.logger.warn("Error deleting document: @error", error);
|
|
873
881
|
}
|
|
874
882
|
await Promise.allSettled([
|
|
875
883
|
this.cache.deleteDocument(documentId).catch(this.logger.warn),
|
|
@@ -1129,7 +1137,7 @@ export class BaseDocumentDriveServer {
|
|
|
1129
1137
|
if (!appliedOperation.error &&
|
|
1130
1138
|
appliedOperation.hash !== operation.hash &&
|
|
1131
1139
|
!skipHashValidation) {
|
|
1132
|
-
this.logger.warn(
|
|
1140
|
+
this.logger.warn("@appliedOperation", appliedOperation);
|
|
1133
1141
|
throw new ConflictOperationError(operation, appliedOperation);
|
|
1134
1142
|
}
|
|
1135
1143
|
for (const signalHandler of operationSignals) {
|
|
@@ -1214,7 +1222,7 @@ export class BaseDocumentDriveServer {
|
|
|
1214
1222
|
});
|
|
1215
1223
|
}
|
|
1216
1224
|
catch (error) {
|
|
1217
|
-
this.logger.error("Error adding job", error);
|
|
1225
|
+
this.logger.error("Error adding job: @error", error);
|
|
1218
1226
|
throw error;
|
|
1219
1227
|
}
|
|
1220
1228
|
return promise;
|
|
@@ -1323,7 +1331,7 @@ export class BaseDocumentDriveServer {
|
|
|
1323
1331
|
});
|
|
1324
1332
|
}
|
|
1325
1333
|
catch (error) {
|
|
1326
|
-
this.logger.error("Error adding job", error);
|
|
1334
|
+
this.logger.error("Error adding job: @error", error);
|
|
1327
1335
|
throw error;
|
|
1328
1336
|
}
|
|
1329
1337
|
return promise;
|
|
@@ -1389,7 +1397,7 @@ export class BaseDocumentDriveServer {
|
|
|
1389
1397
|
});
|
|
1390
1398
|
}
|
|
1391
1399
|
catch (error) {
|
|
1392
|
-
this.logger.error("Error adding job", error);
|
|
1400
|
+
this.logger.error("Error adding job: @error", error);
|
|
1393
1401
|
throw error;
|
|
1394
1402
|
}
|
|
1395
1403
|
}
|
|
@@ -1427,7 +1435,7 @@ export class BaseDocumentDriveServer {
|
|
|
1427
1435
|
});
|
|
1428
1436
|
}
|
|
1429
1437
|
catch (error) {
|
|
1430
|
-
this.logger.error("Error adding drive job", error);
|
|
1438
|
+
this.logger.error("Error adding drive job: @error", error);
|
|
1431
1439
|
throw error;
|
|
1432
1440
|
}
|
|
1433
1441
|
}
|
|
@@ -1477,7 +1485,9 @@ export class BaseDocumentDriveServer {
|
|
|
1477
1485
|
});
|
|
1478
1486
|
const syncUnits = new Array();
|
|
1479
1487
|
if (document) {
|
|
1480
|
-
this.cache
|
|
1488
|
+
this.cache
|
|
1489
|
+
.setDocument(documentId, document)
|
|
1490
|
+
.catch((e) => this.logger.error("@error", e));
|
|
1481
1491
|
// creates array of unique sync units from the applied operations
|
|
1482
1492
|
for (const operation of operationsApplied) {
|
|
1483
1493
|
const syncUnit = {
|
|
@@ -1537,7 +1547,7 @@ export class BaseDocumentDriveServer {
|
|
|
1537
1547
|
}
|
|
1538
1548
|
})
|
|
1539
1549
|
.catch((error) => {
|
|
1540
|
-
this.logger.error("Non handled error updating sync revision", error);
|
|
1550
|
+
this.logger.error("Non handled error updating sync revision: @error", error);
|
|
1541
1551
|
this.synchronizationManager.updateSyncStatus(documentId, {
|
|
1542
1552
|
[operationSource]: "ERROR",
|
|
1543
1553
|
}, error);
|
|
@@ -1667,7 +1677,7 @@ export class BaseDocumentDriveServer {
|
|
|
1667
1677
|
});
|
|
1668
1678
|
}
|
|
1669
1679
|
catch (error) {
|
|
1670
|
-
this.logger.error("Error adding drive job", error);
|
|
1680
|
+
this.logger.error("Error adding drive job: @error", error);
|
|
1671
1681
|
throw error;
|
|
1672
1682
|
}
|
|
1673
1683
|
}
|
|
@@ -1702,8 +1712,12 @@ export class BaseDocumentDriveServer {
|
|
|
1702
1712
|
if (!document || !isDocumentDrive(document)) {
|
|
1703
1713
|
throw error ?? new Error("Invalid Document Drive document");
|
|
1704
1714
|
}
|
|
1705
|
-
this.cache
|
|
1706
|
-
|
|
1715
|
+
this.cache
|
|
1716
|
+
.setDocument(driveId, document)
|
|
1717
|
+
.catch((e) => this.logger.error("@error", e));
|
|
1718
|
+
this.cache
|
|
1719
|
+
.setDrive(driveId, document)
|
|
1720
|
+
.catch((e) => this.logger.error("@error", e));
|
|
1707
1721
|
// update listener cache
|
|
1708
1722
|
const lastOperation = operationsApplied
|
|
1709
1723
|
.filter((op) => op.action.scope === "global")
|
|
@@ -1745,17 +1759,17 @@ export class BaseDocumentDriveServer {
|
|
|
1745
1759
|
}
|
|
1746
1760
|
})
|
|
1747
1761
|
.catch((error) => {
|
|
1748
|
-
this.logger.error("Non handled error updating sync revision", error);
|
|
1762
|
+
this.logger.error("Non handled error updating sync revision: @error", error);
|
|
1749
1763
|
this.synchronizationManager.updateSyncStatus(driveId, {
|
|
1750
1764
|
[operationSource]: "ERROR",
|
|
1751
1765
|
}, error);
|
|
1752
1766
|
});
|
|
1753
1767
|
}
|
|
1754
1768
|
if (this.shouldSyncRemoteDrive(document)) {
|
|
1755
|
-
this.startSyncRemoteDrive(driveId).catch(this.logger.error);
|
|
1769
|
+
this.startSyncRemoteDrive(driveId).catch((e) => this.logger.error("@error", e));
|
|
1756
1770
|
}
|
|
1757
1771
|
else {
|
|
1758
|
-
this.stopSyncRemoteDrive(driveId).catch(this.logger.error);
|
|
1772
|
+
this.stopSyncRemoteDrive(driveId).catch((e) => this.logger.error("@error", e));
|
|
1759
1773
|
}
|
|
1760
1774
|
// after applying all the valid operations,throws
|
|
1761
1775
|
// an error if there was an invalid operation
|
|
@@ -1949,12 +1963,12 @@ export class BaseDocumentDriveServer {
|
|
|
1949
1963
|
});
|
|
1950
1964
|
}
|
|
1951
1965
|
catch (error) {
|
|
1952
|
-
this.logger.error("Error queueing operations", error);
|
|
1966
|
+
this.logger.error("Error queueing operations: @error", error);
|
|
1953
1967
|
throw error;
|
|
1954
1968
|
}
|
|
1955
1969
|
}
|
|
1956
1970
|
if (!result) {
|
|
1957
|
-
this.logger.debug(
|
|
1971
|
+
this.logger.debug("Document @documentId already exists", strand.documentId);
|
|
1958
1972
|
return {
|
|
1959
1973
|
status: "SUCCESS",
|
|
1960
1974
|
document: await this.getDocument(strand.documentId),
|