molymemo 1.0.21 → 1.0.23
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/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -5
- package/dist/index.js.map +1 -1
- package/dist/server-client.d.ts +15 -2
- package/dist/server-client.d.ts.map +1 -1
- package/dist/server-client.js +81 -13
- package/dist/server-client.js.map +1 -1
- package/dist/sync-worker.d.ts +3 -4
- package/dist/sync-worker.d.ts.map +1 -1
- package/dist/sync-worker.js +12 -10
- package/dist/sync-worker.js.map +1 -1
- package/package.json +1 -1
package/dist/index.d.ts
CHANGED
|
@@ -10,12 +10,12 @@ declare const molyMemoPlugin: {
|
|
|
10
10
|
debug: z.ZodOptional<z.ZodBoolean>;
|
|
11
11
|
}, "strip", z.ZodTypeAny, {
|
|
12
12
|
apiKey: string;
|
|
13
|
-
reconnectInterval?: number | undefined;
|
|
14
13
|
debug?: boolean | undefined;
|
|
14
|
+
reconnectInterval?: number | undefined;
|
|
15
15
|
}, {
|
|
16
16
|
apiKey: string;
|
|
17
|
-
reconnectInterval?: number | undefined;
|
|
18
17
|
debug?: boolean | undefined;
|
|
18
|
+
reconnectInterval?: number | undefined;
|
|
19
19
|
}>;
|
|
20
20
|
register(api: OpenClawPluginApi): void;
|
|
21
21
|
};
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAyB7D,QAAA,MAAM,cAAc;;;;;;;;;;;;;;;;;kBAMJ,iBAAiB;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAyB7D,QAAA,MAAM,cAAc;;;;;;;;;;;;;;;;;kBAMJ,iBAAiB;CAmMhC,CAAC;AAEF,eAAe,cAAc,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -109,9 +109,9 @@ const molyMemoPlugin = {
|
|
|
109
109
|
debug: config.debug,
|
|
110
110
|
});
|
|
111
111
|
serverClient.setLogger(logger);
|
|
112
|
-
const pullFileFn = async (filePath
|
|
112
|
+
const pullFileFn = async (filePath) => {
|
|
113
113
|
try {
|
|
114
|
-
const result = await serverClient.pullFile(filePath
|
|
114
|
+
const result = await serverClient.pullFile(filePath);
|
|
115
115
|
writeFileData(result);
|
|
116
116
|
syncWorker.onPullComplete(filePath, result.latest_at);
|
|
117
117
|
}
|
|
@@ -120,15 +120,14 @@ const molyMemoPlugin = {
|
|
|
120
120
|
syncWorker.onPullFailed(filePath);
|
|
121
121
|
}
|
|
122
122
|
};
|
|
123
|
-
const syncWorker = new SyncWorker((filePath
|
|
123
|
+
const syncWorker = new SyncWorker((filePath) => { pullFileFn(filePath); });
|
|
124
124
|
syncWorker.setLogger(logger);
|
|
125
125
|
serverClient.setHandlers({
|
|
126
126
|
onConnected: async () => {
|
|
127
127
|
try {
|
|
128
128
|
const files = scanLocalFiles();
|
|
129
129
|
for (const f of files) {
|
|
130
|
-
|
|
131
|
-
syncWorker.setLocalTimestamp(f.path, meta?.latest_at ?? "");
|
|
130
|
+
syncWorker.setSyncedTimestamp(f.path, f.last_sync_at);
|
|
132
131
|
}
|
|
133
132
|
logger.info(`Checking updates with ${files.length} local files`);
|
|
134
133
|
const updates = await serverClient.checkUpdates(files);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEzC,OAAO,EAAE,oBAAoB,EAAsC,MAAM,oBAAoB,CAAC;AAC9F,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,SAAS,GAAG,UAAU,CAAC;AAC7B,MAAM,MAAM,GAAG,8DAA8D,CAAC;AAC9E,MAAM,OAAO,GAAG,yCAAyC,CAAC;AAE1D,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,iBAAiB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACxC,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CAC9B,CAAC,CAAC;AAWH,MAAM,SAAS,GAAG,sBAAsB,CAAC;AAEzC,MAAM,cAAc,GAAG;IACrB,EAAE,EAAE,SAAS;IACb,IAAI,EAAE,UAAU;IAChB,WAAW,EAAE,4CAA4C;IACzD,YAAY;IAEZ,QAAQ,CAAC,GAAsB;QAC7B,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE,CAAiB,CAAC;QAC1E,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;QAE1B,IAAI,YAAY,GAAG,EAAE,CAAC;QAEtB,MAAM,YAAY,GAAG,GAAW,EAAE,CAChC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;QAE/C,MAAM,WAAW,GAAG,CAAC,YAAoB,EAAU,EAAE,CACnD,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,YAAY,CAAC,CAAC;QAE1C,MAAM,WAAW,GAAG,CAAC,YAAoB,EAAU,EAAE,CACnD,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,YAAY,CAAC,OAAO,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC;QAE5E,MAAM,SAAS,GAAG,CAAC,QAAgB,EAAQ,EAAE;YAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACnC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC;gBAAE,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAClE,CAAC,CAAC;QAEF,MAAM,QAAQ,GAAG,CAAC,YAAoB,EAAmB,EAAE;YACzD,IAAI,CAAC;gBACH,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC;gBAChE,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAa,CAAC;YACrC,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,SAAS,GAAG,CAAC,YAAoB,EAAE,IAAc,EAAQ,EAAE;YAC/D,MAAM,QAAQ,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC;YAC3C,SAAS,CAAC,QAAQ,CAAC,CAAC;YACpB,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;QACnE,CAAC,CAAC;QAEF,MAAM,cAAc,GAAG,GAAe,EAAE;YACtC,MAAM,MAAM,GAAG,YAAY,EAAE,CAAC;YAC9B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC;gBAAE,OAAO,EAAE,CAAC;YAEtC,MAAM,KAAK,GAAe,EAAE,CAAC;YAC7B,MAAM,OAAO,GAAG,CAAC,GAAW,EAAE,MAAc,EAAE,EAAE;gBAC9C,MAAM,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC7D,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;oBAC5B,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;wBACxB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,MAAM,GAAG,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC;oBACjE,CAAC;yBAAM,IAAI,KAAK,CAAC,MAAM,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;wBAC/D,MAAM,QAAQ,GAAG,GAAG,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC;wBAC1E,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;wBAChC,IAAI,CAAC,IAAI;4BAAE,SAAS;wBACpB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,IAAI,QAAQ,CAAC;wBACvC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC,CAAC;oBACrE,CAAC;gBACH,CAAC;YACH,CAAC,CAAC;YACF,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACpB,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;QAEF,MAAM,aAAa,GAAG,CAAC,GAAmB,EAAQ,EAAE;YAClD,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACxB,MAAM,CAAC,IAAI,CAAC,kBAAkB,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC1C,OAAO;YACT,CAAC;YAED,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACvC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAEpB,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;gBAChB,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAC1B,EAAE,CAAC,cAAc,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACpD,CAAC;qBAAM,CAAC;oBACN,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACnD,CAAC;YACH,CAAC;YAED,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAExC,MAAM,IAAI,GAAa;gBACrB,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,SAAS,EAAE,CAAC,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC;oBACvD,CAAC,CAAC,GAAG,CAAC,SAAS;oBACf,CAAC,CAAC,YAAY,EAAE,SAAS,IAAI,EAAE;aAClC,CAAC;YACF,IAAI,GAAG,CAAC,KAAK;gBAAE,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;iBACjC,IAAI,YAAY,EAAE,KAAK;gBAAE,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC;YAC9D,IAAI,GAAG,CAAC,GAAG;gBAAE,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC;iBAC3B,IAAI,YAAY,EAAE,GAAG;gBAAE,IAAI,CAAC,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC;YAExD,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC1B,MAAM,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC;QAClD,CAAC,CAAC;QAEF,MAAM,YAAY,GAAG,IAAI,oBAAoB,CAAC;YAC5C,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,OAAO;YACf,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;YAC3C,KAAK,EAAE,MAAM,CAAC,KAAK;SACpB,CAAC,CAAC;QACH,YAAY,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAE/B,MAAM,UAAU,GAAG,KAAK,EAAE,QAAgB,EAAE,EAAE;YAC5C,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;gBACrD,aAAa,CAAC,MAAM,CAAC,CAAC;gBACtB,UAAU,CAAC,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;YACxD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,CAAC,KAAK,CAAC,kBAAkB,QAAQ,KAAK,GAAG,EAAE,CAAC,CAAC;gBACnD,UAAU,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YACpC,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,UAAU,GAAG,IAAI,UAAU,CAC/B,CAAC,QAAQ,EAAE,EAAE,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CACxC,CAAC;QACF,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAE7B,YAAY,CAAC,WAAW,CAAC;YACvB,WAAW,EAAE,KAAK,IAAI,EAAE;gBACtB,IAAI,CAAC;oBACH,MAAM,KAAK,GAAG,cAAc,EAAE,CAAC;oBAC/B,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;wBACtB,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC;oBACxD,CAAC;oBACD,MAAM,CAAC,IAAI,CAAC,yBAAyB,KAAK,CAAC,MAAM,cAAc,CAAC,CAAC;oBACjE,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;oBACvD,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,sBAAsB,CAAC,CAAC;oBACrD,KAAK,MAAM,CAAC,IAAI,OAAO;wBAAE,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC;gBACrE,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,MAAM,CAAC,KAAK,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAC;gBAClD,CAAC;YACH,CAAC;YAED,aAAa,EAAE,CAAC,GAAG,EAAE,EAAE;gBACrB,MAAM,CAAC,IAAI,CAAC,iBAAiB,GAAG,CAAC,IAAI,OAAO,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;gBAC7D,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;YAChD,CAAC;SACF,CAAC,CAAC;QAEH,GAAG,CAAC,YAAY,CAAC;YACf,IAAI,EAAE,0BAA0B;YAChC,KAAK,EAAE,iBAAiB;YACxB,WAAW,EAAE,iJAAiJ;YAC9J,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC;gBACtB,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,mCAAmC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;gBACrG,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,mCAAmC,EAAE,CAAC,CAAC;aACzF,CAAC;YACF,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM;gBAC/B,MAAM,EAAE,KAAK,GAAG,GAAG,EAAE,MAAM,EAAE,GAAG,MAA6C,CAAC;gBAC9E,IAAI,CAAC;oBACH,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,mBAAmB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;oBACxE,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC;wBAC3B,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;wBAChC,CAAC,CAAC,2BAA2B,CAAC;oBAEhC,OAAO;wBACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,CAAC;wBAC1C,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE;qBACjC,CAAC;gBACJ,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,UAAU,GAAG,EAAE,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;gBACtF,CAAC;YACH,CAAC;SACF,CAAC,CAAC;QAEH,GAAG,CAAC,qBAAqB,CACvB,iBAAiB,EACjB,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;YACpB,OAAO,CAAC,IAAI,EAAE;gBACZ,KAAK,EAAE,MAAM;gBACb,MAAM,EAAE,OAAO;gBACf,SAAS,EAAE,YAAY,CAAC,WAAW,EAAE;gBACrC,OAAO,EAAE,YAAY,EAAE;aACxB,CAAC,CAAC;QACL,CAAC,CACF,CAAC;QAEF,GAAG,CAAC,eAAe,CAAC;YAClB,EAAE,EAAE,SAAS;YACb,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;gBACnB,YAAY,GAAG,GAAG,CAAC,YAAa,CAAC;gBACjC,MAAM,CAAC,IAAI,CAAC,yCAAyC,YAAY,EAAE,CAAC,CAAC;gBACrE,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAC;gBAC/C,IAAI,SAAS,EAAE,CAAC;oBACd,MAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;gBAC9C,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;gBAClD,CAAC;YACH,CAAC;YACD,IAAI,EAAE,KAAK,IAAI,EAAE;gBACf,MAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;gBAC5C,MAAM,YAAY,CAAC,UAAU,EAAE,CAAC;YAClC,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAC;AAEF,eAAe,cAAc,CAAC"}
|
package/dist/server-client.d.ts
CHANGED
|
@@ -10,6 +10,9 @@ export interface ServerConfig {
|
|
|
10
10
|
apiUrl: string;
|
|
11
11
|
apiKey: string;
|
|
12
12
|
reconnectInterval?: number;
|
|
13
|
+
maxReconnectInterval?: number;
|
|
14
|
+
heartbeatInterval?: number;
|
|
15
|
+
heartbeatTimeout?: number;
|
|
13
16
|
debug?: boolean;
|
|
14
17
|
}
|
|
15
18
|
export interface FileInfo {
|
|
@@ -50,19 +53,26 @@ export declare class MolyMemoServerClient {
|
|
|
50
53
|
private wsUrl;
|
|
51
54
|
private apiUrl;
|
|
52
55
|
private apiKey;
|
|
53
|
-
private
|
|
56
|
+
private baseReconnectInterval;
|
|
57
|
+
private maxReconnectInterval;
|
|
58
|
+
private heartbeatInterval;
|
|
59
|
+
private heartbeatTimeout;
|
|
54
60
|
private debug;
|
|
55
61
|
private ws;
|
|
56
62
|
private connected;
|
|
57
63
|
private shouldReconnect;
|
|
58
64
|
private reconnectTimer;
|
|
65
|
+
private reconnectAttempts;
|
|
66
|
+
private heartbeatTimer;
|
|
67
|
+
private pongReceived;
|
|
68
|
+
private lastMessageAt;
|
|
59
69
|
private handlers;
|
|
60
70
|
private logger;
|
|
61
71
|
constructor(config: ServerConfig);
|
|
62
72
|
setLogger(logger: PluginLogger): void;
|
|
63
73
|
setHandlers(handlers: ServerMessageHandlers): void;
|
|
64
74
|
checkUpdates(files: FileInfo[]): Promise<FileUpdate[]>;
|
|
65
|
-
pullFile(filePath: string
|
|
75
|
+
pullFile(filePath: string): Promise<PullFileResult>;
|
|
66
76
|
fetchBrowserHistory(params: {
|
|
67
77
|
limit?: number;
|
|
68
78
|
domain?: string;
|
|
@@ -72,7 +82,10 @@ export declare class MolyMemoServerClient {
|
|
|
72
82
|
isConnected(): boolean;
|
|
73
83
|
private doConnect;
|
|
74
84
|
private handleMessage;
|
|
85
|
+
private getReconnectDelay;
|
|
75
86
|
private scheduleReconnect;
|
|
87
|
+
private startHeartbeat;
|
|
88
|
+
private stopHeartbeat;
|
|
76
89
|
}
|
|
77
90
|
export {};
|
|
78
91
|
//# sourceMappingURL=server-client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-client.d.ts","sourceRoot":"","sources":["../src/server-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,MAAM,WAAW,YAAY;IAC3B,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CAClC;AAED,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAQD,QAAA,MAAM,wBAAwB;;;;;;;;;;;;EAI5B,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E,MAAM,WAAW,qBAAqB;IACpC,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,aAAa,EAAE,CAAC,GAAG,EAAE,kBAAkB,KAAK,IAAI,CAAC;CAClD;AAED,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,KAAK,CAAU;IACvB,OAAO,CAAC,EAAE,CAA0B;IACpC,OAAO,CAAC,SAAS,CAAkB;IACnC,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,cAAc,CAA8C;IACpE,OAAO,CAAC,QAAQ,CAAsC;IACtD,OAAO,CAAC,MAAM,CAA6B;gBAE/B,MAAM,EAAE,YAAY;
|
|
1
|
+
{"version":3,"file":"server-client.d.ts","sourceRoot":"","sources":["../src/server-client.ts"],"names":[],"mappings":"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"}
|
package/dist/server-client.js
CHANGED
|
@@ -14,19 +14,29 @@ export class MolyMemoServerClient {
|
|
|
14
14
|
wsUrl;
|
|
15
15
|
apiUrl;
|
|
16
16
|
apiKey;
|
|
17
|
-
|
|
17
|
+
baseReconnectInterval;
|
|
18
|
+
maxReconnectInterval;
|
|
19
|
+
heartbeatInterval;
|
|
20
|
+
heartbeatTimeout;
|
|
18
21
|
debug;
|
|
19
22
|
ws = null;
|
|
20
23
|
connected = false;
|
|
21
24
|
shouldReconnect = false;
|
|
22
25
|
reconnectTimer = null;
|
|
26
|
+
reconnectAttempts = 0;
|
|
27
|
+
heartbeatTimer = null;
|
|
28
|
+
pongReceived = true;
|
|
29
|
+
lastMessageAt = 0;
|
|
23
30
|
handlers = null;
|
|
24
31
|
logger = null;
|
|
25
32
|
constructor(config) {
|
|
26
33
|
this.wsUrl = config.wsUrl.replace(/^http/, "ws").replace(/\/$/, "");
|
|
27
34
|
this.apiUrl = config.apiUrl.replace(/\/$/, "");
|
|
28
35
|
this.apiKey = config.apiKey;
|
|
29
|
-
this.
|
|
36
|
+
this.baseReconnectInterval = config.reconnectInterval ?? 3000;
|
|
37
|
+
this.maxReconnectInterval = config.maxReconnectInterval ?? 60000;
|
|
38
|
+
this.heartbeatInterval = config.heartbeatInterval ?? 30000;
|
|
39
|
+
this.heartbeatTimeout = config.heartbeatTimeout ?? 10000;
|
|
30
40
|
this.debug = config.debug ?? false;
|
|
31
41
|
}
|
|
32
42
|
setLogger(logger) {
|
|
@@ -57,11 +67,8 @@ export class MolyMemoServerClient {
|
|
|
57
67
|
}
|
|
58
68
|
return (parsed.data ?? []);
|
|
59
69
|
}
|
|
60
|
-
async pullFile(filePath
|
|
61
|
-
const
|
|
62
|
-
if (since)
|
|
63
|
-
params.set("since", since);
|
|
64
|
-
const url = `${this.apiUrl}/oapi/pull_data?${params.toString()}`;
|
|
70
|
+
async pullFile(filePath) {
|
|
71
|
+
const url = `${this.apiUrl}/oapi/pull_data?path=${encodeURIComponent(filePath)}`;
|
|
65
72
|
if (this.debug)
|
|
66
73
|
this.logger?.info(`[http] GET ${url}`);
|
|
67
74
|
const res = await fetch(url, {
|
|
@@ -108,15 +115,18 @@ export class MolyMemoServerClient {
|
|
|
108
115
|
}
|
|
109
116
|
async disconnect() {
|
|
110
117
|
this.shouldReconnect = false;
|
|
118
|
+
this.stopHeartbeat();
|
|
111
119
|
if (this.reconnectTimer) {
|
|
112
120
|
clearTimeout(this.reconnectTimer);
|
|
113
121
|
this.reconnectTimer = null;
|
|
114
122
|
}
|
|
115
123
|
if (this.ws) {
|
|
124
|
+
this.ws.removeAllListeners();
|
|
116
125
|
this.ws.close();
|
|
117
126
|
this.ws = null;
|
|
118
127
|
}
|
|
119
128
|
this.connected = false;
|
|
129
|
+
this.reconnectAttempts = 0;
|
|
120
130
|
this.logger?.info("WebSocket disconnected");
|
|
121
131
|
}
|
|
122
132
|
isConnected() {
|
|
@@ -128,34 +138,55 @@ export class MolyMemoServerClient {
|
|
|
128
138
|
resolve(false);
|
|
129
139
|
return;
|
|
130
140
|
}
|
|
141
|
+
let resolved = false;
|
|
142
|
+
const safeResolve = (val) => {
|
|
143
|
+
if (!resolved) {
|
|
144
|
+
resolved = true;
|
|
145
|
+
resolve(val);
|
|
146
|
+
}
|
|
147
|
+
};
|
|
131
148
|
try {
|
|
132
149
|
const url = `${this.wsUrl}?api_key=${encodeURIComponent(this.apiKey)}`;
|
|
133
|
-
this.logger?.info(`Connecting to ${this.wsUrl}`);
|
|
150
|
+
this.logger?.info(`Connecting to ${this.wsUrl} (attempt ${this.reconnectAttempts + 1})`);
|
|
134
151
|
this.ws = new WebSocket(url);
|
|
135
152
|
this.ws.on("open", () => {
|
|
136
153
|
this.connected = true;
|
|
154
|
+
this.reconnectAttempts = 0;
|
|
155
|
+
this.lastMessageAt = Date.now();
|
|
137
156
|
this.logger?.info("WebSocket connected");
|
|
157
|
+
this.startHeartbeat();
|
|
138
158
|
this.handlers?.onConnected();
|
|
139
|
-
|
|
159
|
+
safeResolve(true);
|
|
140
160
|
});
|
|
141
161
|
this.ws.on("message", (data) => {
|
|
162
|
+
this.lastMessageAt = Date.now();
|
|
142
163
|
this.handleMessage(data);
|
|
143
164
|
});
|
|
165
|
+
this.ws.on("pong", () => {
|
|
166
|
+
this.pongReceived = true;
|
|
167
|
+
this.lastMessageAt = Date.now();
|
|
168
|
+
if (this.debug)
|
|
169
|
+
this.logger?.debug?.("pong received");
|
|
170
|
+
});
|
|
144
171
|
this.ws.on("close", (code, reason) => {
|
|
145
172
|
this.connected = false;
|
|
173
|
+
this.stopHeartbeat();
|
|
146
174
|
this.logger?.info(`WebSocket closed: ${code} ${reason?.toString() || ""}`);
|
|
175
|
+
safeResolve(false);
|
|
147
176
|
this.scheduleReconnect();
|
|
148
177
|
});
|
|
149
178
|
this.ws.on("error", (err) => {
|
|
150
179
|
this.logger?.error(`WebSocket error: ${err.message}`);
|
|
151
180
|
this.connected = false;
|
|
152
|
-
|
|
181
|
+
this.stopHeartbeat();
|
|
182
|
+
safeResolve(false);
|
|
153
183
|
});
|
|
154
184
|
}
|
|
155
185
|
catch (error) {
|
|
156
186
|
this.logger?.error(`Failed to create WebSocket: ${error}`);
|
|
157
187
|
this.connected = false;
|
|
158
|
-
|
|
188
|
+
safeResolve(false);
|
|
189
|
+
this.scheduleReconnect();
|
|
159
190
|
}
|
|
160
191
|
});
|
|
161
192
|
}
|
|
@@ -182,16 +213,53 @@ export class MolyMemoServerClient {
|
|
|
182
213
|
this.logger?.error(`Failed to parse message: ${error}`);
|
|
183
214
|
}
|
|
184
215
|
}
|
|
216
|
+
getReconnectDelay() {
|
|
217
|
+
const base = this.baseReconnectInterval * Math.pow(2, this.reconnectAttempts);
|
|
218
|
+
const capped = Math.min(base, this.maxReconnectInterval);
|
|
219
|
+
const jitter = capped * (0.5 + Math.random() * 0.5);
|
|
220
|
+
return Math.round(jitter);
|
|
221
|
+
}
|
|
185
222
|
scheduleReconnect() {
|
|
186
223
|
if (!this.shouldReconnect)
|
|
187
224
|
return;
|
|
188
225
|
if (this.reconnectTimer)
|
|
189
226
|
clearTimeout(this.reconnectTimer);
|
|
190
|
-
|
|
227
|
+
const delay = this.getReconnectDelay();
|
|
228
|
+
this.reconnectAttempts++;
|
|
229
|
+
this.logger?.info(`Reconnecting in ${delay}ms (attempt ${this.reconnectAttempts})...`);
|
|
191
230
|
this.reconnectTimer = setTimeout(() => {
|
|
192
231
|
if (this.shouldReconnect)
|
|
193
232
|
this.doConnect().catch(() => { });
|
|
194
|
-
},
|
|
233
|
+
}, delay);
|
|
234
|
+
}
|
|
235
|
+
startHeartbeat() {
|
|
236
|
+
this.stopHeartbeat();
|
|
237
|
+
this.pongReceived = true;
|
|
238
|
+
this.heartbeatTimer = setInterval(() => {
|
|
239
|
+
if (!this.ws || this.ws.readyState !== WebSocket.OPEN)
|
|
240
|
+
return;
|
|
241
|
+
if (!this.pongReceived) {
|
|
242
|
+
this.logger?.warn("Heartbeat timeout, no pong received. Reconnecting...");
|
|
243
|
+
this.ws.terminate();
|
|
244
|
+
return;
|
|
245
|
+
}
|
|
246
|
+
this.pongReceived = false;
|
|
247
|
+
try {
|
|
248
|
+
this.ws.ping();
|
|
249
|
+
if (this.debug)
|
|
250
|
+
this.logger?.debug?.("ping sent");
|
|
251
|
+
}
|
|
252
|
+
catch (err) {
|
|
253
|
+
this.logger?.error(`Failed to send ping: ${err}`);
|
|
254
|
+
this.ws.terminate();
|
|
255
|
+
}
|
|
256
|
+
}, this.heartbeatInterval);
|
|
257
|
+
}
|
|
258
|
+
stopHeartbeat() {
|
|
259
|
+
if (this.heartbeatTimer) {
|
|
260
|
+
clearInterval(this.heartbeatTimer);
|
|
261
|
+
this.heartbeatTimer = null;
|
|
262
|
+
}
|
|
195
263
|
}
|
|
196
264
|
}
|
|
197
265
|
//# sourceMappingURL=server-client.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-client.js","sourceRoot":"","sources":["../src/server-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,SAAS,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"server-client.js","sourceRoot":"","sources":["../src/server-client.ts"],"names":[],"mappings":"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"}
|
package/dist/sync-worker.d.ts
CHANGED
|
@@ -1,16 +1,15 @@
|
|
|
1
1
|
import type { PluginLogger } from "./server-client.js";
|
|
2
|
-
export type PullFileFn = (path: string
|
|
2
|
+
export type PullFileFn = (path: string) => void;
|
|
3
3
|
export declare class SyncWorker {
|
|
4
4
|
private pending;
|
|
5
5
|
private inProgress;
|
|
6
|
-
private
|
|
6
|
+
private syncedTimestamps;
|
|
7
7
|
private maxConcurrent;
|
|
8
8
|
private pullFile;
|
|
9
9
|
private logger;
|
|
10
10
|
constructor(pullFile: PullFileFn, maxConcurrent?: number);
|
|
11
11
|
setLogger(logger: PluginLogger): void;
|
|
12
|
-
|
|
13
|
-
getLocalTimestamp(path: string): string;
|
|
12
|
+
setSyncedTimestamp(path: string, timestamp: string): void;
|
|
14
13
|
queueSync(path: string, latestAt: string): void;
|
|
15
14
|
onPullComplete(path: string, latestAt: string): void;
|
|
16
15
|
onPullFailed(path: string): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-worker.d.ts","sourceRoot":"","sources":["../src/sync-worker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,MAAM,UAAU,GAAG,CAAC,IAAI,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"sync-worker.d.ts","sourceRoot":"","sources":["../src/sync-worker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,MAAM,UAAU,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;AAEhD,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAAkC;IACjD,OAAO,CAAC,UAAU,CAAkC;IACpD,OAAO,CAAC,gBAAgB,CAAkC;IAC1D,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAa;IAC7B,OAAO,CAAC,MAAM,CAA6B;gBAE/B,QAAQ,EAAE,UAAU,EAAE,aAAa,SAAI;IAKnD,SAAS,CAAC,MAAM,EAAE,YAAY;IAI9B,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAIlD,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAoBxC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAM7C,YAAY,CAAC,IAAI,EAAE,MAAM;IAKzB,OAAO,CAAC,KAAK;CAed"}
|
package/dist/sync-worker.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export class SyncWorker {
|
|
2
2
|
pending = new Map();
|
|
3
3
|
inProgress = new Map();
|
|
4
|
-
|
|
4
|
+
syncedTimestamps = new Map();
|
|
5
5
|
maxConcurrent;
|
|
6
6
|
pullFile;
|
|
7
7
|
logger = null;
|
|
@@ -12,13 +12,15 @@ export class SyncWorker {
|
|
|
12
12
|
setLogger(logger) {
|
|
13
13
|
this.logger = logger;
|
|
14
14
|
}
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
getLocalTimestamp(path) {
|
|
19
|
-
return this.localTimestamps.get(path) ?? "";
|
|
15
|
+
setSyncedTimestamp(path, timestamp) {
|
|
16
|
+
if (timestamp)
|
|
17
|
+
this.syncedTimestamps.set(path, timestamp);
|
|
20
18
|
}
|
|
21
19
|
queueSync(path, latestAt) {
|
|
20
|
+
const syncedTs = this.syncedTimestamps.get(path);
|
|
21
|
+
if (syncedTs !== undefined && syncedTs >= latestAt) {
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
22
24
|
const inProgressTs = this.inProgress.get(path);
|
|
23
25
|
if (inProgressTs !== undefined && inProgressTs >= latestAt) {
|
|
24
26
|
return;
|
|
@@ -32,7 +34,8 @@ export class SyncWorker {
|
|
|
32
34
|
}
|
|
33
35
|
onPullComplete(path, latestAt) {
|
|
34
36
|
this.inProgress.delete(path);
|
|
35
|
-
|
|
37
|
+
if (latestAt)
|
|
38
|
+
this.syncedTimestamps.set(path, latestAt);
|
|
36
39
|
this.drain();
|
|
37
40
|
}
|
|
38
41
|
onPullFailed(path) {
|
|
@@ -47,9 +50,8 @@ export class SyncWorker {
|
|
|
47
50
|
continue;
|
|
48
51
|
this.pending.delete(path);
|
|
49
52
|
this.inProgress.set(path, latestAt);
|
|
50
|
-
|
|
51
|
-
this.
|
|
52
|
-
this.pullFile(path, since);
|
|
53
|
+
this.logger?.info(`Pulling ${path}`);
|
|
54
|
+
this.pullFile(path);
|
|
53
55
|
if (this.inProgress.size >= this.maxConcurrent)
|
|
54
56
|
break;
|
|
55
57
|
}
|
package/dist/sync-worker.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-worker.js","sourceRoot":"","sources":["../src/sync-worker.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,UAAU;IACb,OAAO,GAAwB,IAAI,GAAG,EAAE,CAAC;IACzC,UAAU,GAAwB,IAAI,GAAG,EAAE,CAAC;IAC5C,
|
|
1
|
+
{"version":3,"file":"sync-worker.js","sourceRoot":"","sources":["../src/sync-worker.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,UAAU;IACb,OAAO,GAAwB,IAAI,GAAG,EAAE,CAAC;IACzC,UAAU,GAAwB,IAAI,GAAG,EAAE,CAAC;IAC5C,gBAAgB,GAAwB,IAAI,GAAG,EAAE,CAAC;IAClD,aAAa,CAAS;IACtB,QAAQ,CAAa;IACrB,MAAM,GAAwB,IAAI,CAAC;IAE3C,YAAY,QAAoB,EAAE,aAAa,GAAG,CAAC;QACjD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAED,SAAS,CAAC,MAAoB;QAC5B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,kBAAkB,CAAC,IAAY,EAAE,SAAiB;QAChD,IAAI,SAAS;YAAE,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC5D,CAAC;IAED,SAAS,CAAC,IAAY,EAAE,QAAgB;QACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,IAAI,QAAQ,EAAE,CAAC;YACnD,OAAO;QACT,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,IAAI,QAAQ,EAAE,CAAC;YAC3D,OAAO;QACT,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,SAAS,KAAK,SAAS,IAAI,SAAS,IAAI,QAAQ,EAAE,CAAC;YACrD,OAAO;QACT,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;IAED,cAAc,CAAC,IAAY,EAAE,QAAgB;QAC3C,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC7B,IAAI,QAAQ;YAAE,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACxD,IAAI,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;IAED,YAAY,CAAC,IAAY;QACvB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC7B,IAAI,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;IAEO,KAAK;QACX,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,IAAI,CAAC,aAAa;YAAE,OAAO;QAEvD,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAC5C,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,SAAS;YAExC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC1B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAEpC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;YACrC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAEpB,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,IAAI,CAAC,aAAa;gBAAE,MAAM;QACxD,CAAC;IACH,CAAC;CACF"}
|