pushwork 1.2.3 → 1.2.4
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/browser/browser-sync-engine.d.ts +64 -0
- package/dist/browser/browser-sync-engine.d.ts.map +1 -0
- package/dist/browser/browser-sync-engine.js +303 -0
- package/dist/browser/browser-sync-engine.js.map +1 -0
- package/dist/browser/filesystem-adapter.d.ts +84 -0
- package/dist/browser/filesystem-adapter.d.ts.map +1 -0
- package/dist/browser/filesystem-adapter.js +413 -0
- package/dist/browser/filesystem-adapter.js.map +1 -0
- package/dist/browser/index.d.ts +36 -0
- package/dist/browser/index.d.ts.map +1 -0
- package/dist/browser/index.js +90 -0
- package/dist/browser/index.js.map +1 -0
- package/dist/browser/types.d.ts +70 -0
- package/dist/browser/types.d.ts.map +1 -0
- package/dist/browser/types.js +6 -0
- package/dist/browser/types.js.map +1 -0
- package/dist/cli/commands.d.ts +6 -0
- package/dist/cli/commands.d.ts.map +1 -1
- package/dist/cli/commands.js +114 -4
- package/dist/cli/commands.js.map +1 -1
- package/dist/cli/output.d.ts +75 -0
- package/dist/cli/output.d.ts.map +1 -0
- package/dist/cli/output.js +182 -0
- package/dist/cli/output.js.map +1 -0
- package/dist/config/remote-manager.d.ts +65 -0
- package/dist/config/remote-manager.d.ts.map +1 -0
- package/dist/config/remote-manager.js +243 -0
- package/dist/config/remote-manager.js.map +1 -0
- package/dist/config.d.ts +16 -0
- package/dist/config.d.ts.map +1 -0
- package/dist/config.js +83 -0
- package/dist/config.js.map +1 -0
- package/dist/core/isomorphic-snapshot.d.ts +58 -0
- package/dist/core/isomorphic-snapshot.d.ts.map +1 -0
- package/dist/core/isomorphic-snapshot.js +204 -0
- package/dist/core/isomorphic-snapshot.js.map +1 -0
- package/dist/fs-tree.d.ts +6 -0
- package/dist/fs-tree.d.ts.map +1 -0
- package/dist/fs-tree.js +99 -0
- package/dist/fs-tree.js.map +1 -0
- package/dist/ignore.d.ts +6 -0
- package/dist/ignore.d.ts.map +1 -0
- package/dist/ignore.js +74 -0
- package/dist/ignore.js.map +1 -0
- package/dist/log.d.ts +3 -0
- package/dist/log.d.ts.map +1 -0
- package/dist/log.js +14 -0
- package/dist/log.js.map +1 -0
- package/dist/platform/browser-filesystem.d.ts +26 -0
- package/dist/platform/browser-filesystem.d.ts.map +1 -0
- package/dist/platform/browser-filesystem.js +91 -0
- package/dist/platform/browser-filesystem.js.map +1 -0
- package/dist/platform/filesystem.d.ts +29 -0
- package/dist/platform/filesystem.d.ts.map +1 -0
- package/dist/platform/filesystem.js +65 -0
- package/dist/platform/filesystem.js.map +1 -0
- package/dist/platform/node-filesystem.d.ts +21 -0
- package/dist/platform/node-filesystem.d.ts.map +1 -0
- package/dist/platform/node-filesystem.js +93 -0
- package/dist/platform/node-filesystem.js.map +1 -0
- package/dist/polyfill-node-window.d.ts +13 -0
- package/dist/polyfill-node-window.d.ts.map +1 -0
- package/dist/polyfill-node-window.js +17 -0
- package/dist/polyfill-node-window.js.map +1 -0
- package/dist/pushwork.d.ts +97 -0
- package/dist/pushwork.d.ts.map +1 -0
- package/dist/pushwork.js +726 -0
- package/dist/pushwork.js.map +1 -0
- package/dist/repo.d.ts +14 -0
- package/dist/repo.d.ts.map +1 -0
- package/dist/repo.js +60 -0
- package/dist/repo.js.map +1 -0
- package/dist/shapes/custom.d.ts +3 -0
- package/dist/shapes/custom.d.ts.map +1 -0
- package/dist/shapes/custom.js +57 -0
- package/dist/shapes/custom.js.map +1 -0
- package/dist/shapes/file.d.ts +20 -0
- package/dist/shapes/file.d.ts.map +1 -0
- package/dist/shapes/file.js +140 -0
- package/dist/shapes/file.js.map +1 -0
- package/dist/shapes/index.d.ts +10 -0
- package/dist/shapes/index.d.ts.map +1 -0
- package/dist/shapes/index.js +35 -0
- package/dist/shapes/index.js.map +1 -0
- package/dist/shapes/patchwork-folder.d.ts +3 -0
- package/dist/shapes/patchwork-folder.d.ts.map +1 -0
- package/dist/shapes/patchwork-folder.js +160 -0
- package/dist/shapes/patchwork-folder.js.map +1 -0
- package/dist/shapes/types.d.ts +38 -0
- package/dist/shapes/types.d.ts.map +1 -0
- package/dist/shapes/types.js +52 -0
- package/dist/shapes/types.js.map +1 -0
- package/dist/shapes/vfs.d.ts +3 -0
- package/dist/shapes/vfs.d.ts.map +1 -0
- package/dist/shapes/vfs.js +92 -0
- package/dist/shapes/vfs.js.map +1 -0
- package/dist/snarf.d.ts +21 -0
- package/dist/snarf.d.ts.map +1 -0
- package/dist/snarf.js +117 -0
- package/dist/snarf.js.map +1 -0
- package/dist/utils/fs-browser.d.ts +57 -0
- package/dist/utils/fs-browser.d.ts.map +1 -0
- package/dist/utils/fs-browser.js +311 -0
- package/dist/utils/fs-browser.js.map +1 -0
- package/dist/utils/fs-node.d.ts +53 -0
- package/dist/utils/fs-node.d.ts.map +1 -0
- package/dist/utils/fs-node.js +220 -0
- package/dist/utils/fs-node.js.map +1 -0
- package/dist/utils/isomorphic.d.ts +29 -0
- package/dist/utils/isomorphic.d.ts.map +1 -0
- package/dist/utils/isomorphic.js +139 -0
- package/dist/utils/isomorphic.js.map +1 -0
- package/dist/utils/pure.d.ts +25 -0
- package/dist/utils/pure.d.ts.map +1 -0
- package/dist/utils/pure.js +112 -0
- package/dist/utils/pure.js.map +1 -0
- package/dist/utils/repo-factory.d.ts.map +1 -1
- package/dist/utils/repo-factory.js +0 -1
- package/dist/utils/repo-factory.js.map +1 -1
- package/dist/version.d.ts +11 -0
- package/dist/version.d.ts.map +1 -0
- package/dist/version.js +93 -0
- package/dist/version.js.map +1 -0
- package/package.json +5 -5
- package/src/utils/repo-factory.ts +78 -85
|
@@ -1,12 +1,8 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
} from "
|
|
6
|
-
import {NodeFSStorageAdapter} from "@automerge/automerge-repo-storage-nodefs"
|
|
7
|
-
import * as fs from "fs/promises"
|
|
8
|
-
import * as path from "path"
|
|
9
|
-
import {DirectoryConfig} from "../types"
|
|
1
|
+
import { type Repo, type RepoConfig, type NetworkAdapterInterface } from "@automerge/automerge-repo";
|
|
2
|
+
import { NodeFSStorageAdapter } from "@automerge/automerge-repo-storage-nodefs";
|
|
3
|
+
import * as fs from "fs/promises";
|
|
4
|
+
import * as path from "path";
|
|
5
|
+
import { DirectoryConfig } from "../types";
|
|
10
6
|
|
|
11
7
|
/**
|
|
12
8
|
* Perform a real ESM dynamic import that tsc won't rewrite to require().
|
|
@@ -22,8 +18,8 @@ import {DirectoryConfig} from "../types"
|
|
|
22
18
|
* Repo's internal imports.
|
|
23
19
|
*/
|
|
24
20
|
const dynamicImport = new Function("specifier", "return import(specifier)") as (
|
|
25
|
-
|
|
26
|
-
) => Promise<any
|
|
21
|
+
specifier: string,
|
|
22
|
+
) => Promise<any>;
|
|
27
23
|
|
|
28
24
|
/**
|
|
29
25
|
* Initialize the Subduction Wasm module and return the Repo constructor.
|
|
@@ -37,22 +33,22 @@ const dynamicImport = new Function("specifier", "return import(specifier)") as (
|
|
|
37
33
|
* Both the Repo and initSubduction must be loaded via ESM dynamic import()
|
|
38
34
|
* so they share the same module graph as the Repo's internal /slim imports.
|
|
39
35
|
*/
|
|
40
|
-
let cachedRepoClass: typeof Repo | undefined
|
|
36
|
+
let cachedRepoClass: typeof Repo | undefined;
|
|
41
37
|
|
|
42
38
|
async function getRepoClass(): Promise<typeof Repo> {
|
|
43
|
-
|
|
39
|
+
if (cachedRepoClass) return cachedRepoClass;
|
|
44
40
|
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
41
|
+
// Import Repo and initialize Subduction Wasm via automerge-repo's
|
|
42
|
+
// initSubduction() helper. This must happen before new Repo() because
|
|
43
|
+
// the constructor calls set_subduction_logger() and new MemorySigner()
|
|
44
|
+
// which require the Wasm module to be ready.
|
|
45
|
+
//
|
|
46
|
+
// Both imports use the ESM dynamic import wrapper so they share the
|
|
47
|
+
// same module graph as the Repo's internal /slim imports.
|
|
48
|
+
const repoMod = await dynamicImport("@automerge/automerge-repo");
|
|
49
|
+
await repoMod.initSubduction();
|
|
50
|
+
cachedRepoClass = repoMod.Repo as typeof Repo;
|
|
51
|
+
return cachedRepoClass;
|
|
56
52
|
}
|
|
57
53
|
|
|
58
54
|
/**
|
|
@@ -61,23 +57,23 @@ async function getRepoClass(): Promise<typeof Repo> {
|
|
|
61
57
|
* if any are found.
|
|
62
58
|
*/
|
|
63
59
|
async function hasCorruptStorage(dir: string): Promise<boolean> {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
60
|
+
try {
|
|
61
|
+
await fs.access(dir);
|
|
62
|
+
} catch {
|
|
63
|
+
return false;
|
|
64
|
+
}
|
|
69
65
|
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
66
|
+
const entries = await fs.readdir(dir, { withFileTypes: true });
|
|
67
|
+
for (const entry of entries) {
|
|
68
|
+
const fullPath = path.join(dir, entry.name);
|
|
69
|
+
if (entry.isDirectory()) {
|
|
70
|
+
if (await hasCorruptStorage(fullPath)) return true;
|
|
71
|
+
} else if (entry.isFile()) {
|
|
72
|
+
const stat = await fs.stat(fullPath);
|
|
73
|
+
if (stat.size === 0) return true;
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
return false;
|
|
81
77
|
}
|
|
82
78
|
|
|
83
79
|
/**
|
|
@@ -92,58 +88,55 @@ async function hasCorruptStorage(dir: string): Promise<boolean> {
|
|
|
92
88
|
* adapter for sync via the automerge sync server.
|
|
93
89
|
*/
|
|
94
90
|
export async function createRepo(
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
91
|
+
workingDir: string,
|
|
92
|
+
config: DirectoryConfig,
|
|
93
|
+
sub: boolean = false
|
|
98
94
|
): Promise<Repo> {
|
|
99
|
-
|
|
95
|
+
const RepoClass = await getRepoClass();
|
|
100
96
|
|
|
101
|
-
|
|
102
|
-
|
|
97
|
+
const syncToolDir = path.join(workingDir, ".pushwork");
|
|
98
|
+
const automergeDir = path.join(syncToolDir, "automerge");
|
|
103
99
|
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
100
|
+
// Detect and recover from corrupt local storage (0-byte files left by
|
|
101
|
+
// incomplete writes from a previous run). Wipe the cache so the Repo
|
|
102
|
+
// hydrates cleanly from the sync server.
|
|
103
|
+
if (await hasCorruptStorage(automergeDir)) {
|
|
104
|
+
console.warn("[pushwork] Corrupt local storage detected, clearing cache...");
|
|
105
|
+
await fs.rm(automergeDir, { recursive: true, force: true });
|
|
106
|
+
await fs.mkdir(automergeDir, { recursive: true });
|
|
107
|
+
}
|
|
112
108
|
|
|
113
|
-
|
|
109
|
+
const storage = new NodeFSStorageAdapter(automergeDir);
|
|
114
110
|
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
111
|
+
if (sub) {
|
|
112
|
+
const endpoints: string[] = [];
|
|
113
|
+
if (config.sync_enabled && config.sync_server) {
|
|
114
|
+
endpoints.push(config.sync_server);
|
|
115
|
+
}
|
|
120
116
|
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
}
|
|
117
|
+
return new RepoClass({
|
|
118
|
+
storage,
|
|
119
|
+
subductionWebsocketEndpoints: endpoints,
|
|
120
|
+
});
|
|
121
|
+
}
|
|
127
122
|
|
|
128
|
-
|
|
129
|
-
|
|
123
|
+
// Default: WebSocket sync adapter
|
|
124
|
+
const repoConfig: RepoConfig = { storage };
|
|
130
125
|
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
repoConfig.network = [networkAdapter]
|
|
146
|
-
}
|
|
126
|
+
if (config.sync_enabled && config.sync_server) {
|
|
127
|
+
// Load the WebSocket adapter via ESM dynamic import to stay in the
|
|
128
|
+
// same module graph as the Repo.
|
|
129
|
+
const wsMod = await dynamicImport("@automerge/automerge-repo-network-websocket");
|
|
130
|
+
// The websocket adapter package (subduction.8) hasn't updated its
|
|
131
|
+
// NetworkAdapter base-class types to match the repo's new
|
|
132
|
+
// NetworkAdapterInterface (which added state() and stricter
|
|
133
|
+
// EventEmitter generics). At runtime the adapter has all required
|
|
134
|
+
// methods; this is purely a declaration mismatch.
|
|
135
|
+
const networkAdapter = new wsMod.BrowserWebSocketClientAdapter(
|
|
136
|
+
config.sync_server
|
|
137
|
+
) as unknown as NetworkAdapterInterface;
|
|
138
|
+
repoConfig.network = [networkAdapter];
|
|
139
|
+
}
|
|
147
140
|
|
|
148
|
-
|
|
141
|
+
return new RepoClass(repoConfig);
|
|
149
142
|
}
|