@inkandswitch/patchwork-bootloader 0.6.1 → 0.6.3

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @inkandswitch/patchwork-bootloader
 
+## 0.6.3
+
+### Patch Changes
+
+- ebca53b: Move the automerge-repo subduction fork to 2.6.0-subduction.48, `@automerge/automerge-repo-keyhive` to 0.5.0-alpha.7, and `@keyhive/keyhive` to 0.1.0-alpha.8. These three are bumped together because the keyhive package pins its automerge-repo version exactly.
+
+  keyhive 0.5 renames the two hive flavours. The network-adapter hive is now `LegacyAutomergeRepoKeyhive`, built by `initializeLegacyAutomergeRepoKeyhive`; the subduction hive keeps the name `AutomergeRepoKeyhive` and is built by `initializeAutomergeRepoKeyhive`. Both extend `AutomergeRepoKeyhiveBase`, which is what Patchwork's `hive` fields are typed as, so a tool that only reads membership works against either.
+
+  `createKeyhiveNetworkAdapter` takes an options object instead of positional arguments, and `onlyShareWithHardcodedServerPeerId` is now `onlyShareWithSyncServer`.
+
+- Updated dependencies [ebca53b]
+- Updated dependencies [882eacd]
+  - @inkandswitch/patchwork-elements@6.0.2
+  - @inkandswitch/patchwork-filesystem@0.2.8
+  - @inkandswitch/patchwork-plugins@1.2.3
+  - @inkandswitch/patchwork-providers@0.5.2
+
+## 0.6.2
+
+### Patch Changes
+
+- f37bb8e: Bump `@automerge/automerge-subduction` to 0.16.1.
+
 ## 0.6.1
 
 ### Patch Changes

package/dist/automerge-worker.js

@@ -17,7 +17,7 @@ import { resolvePath } from "@inkandswitch/patchwork-filesystem";
 import { IndexedDBWorkerStorageAdapter } from "@automerge/automerge-repo-storage-indexeddb/IndexedDBWorkerStorageAdapter";
 import { MessageChannelNetworkAdapter } from "@automerge/automerge-repo-network-messagechannel";
 import { WebSocketWorkerClientAdapter } from "@automerge/automerge-repo-network-websocket";
-import { initializeAutomergeRepoKeyhiveRustWithRepo, initKeyhiveWasm, } from "@automerge/automerge-repo-keyhive";
+import { initializeAutomergeRepoKeyhive, initKeyhiveWasm, } from "@automerge/automerge-repo-keyhive";
 import { DEFAULT_CLASSIC_SYNC_SERVER } from "./sync-config.js";
 import { keyhiveStorageName, storagePrefix } from "./storage.js";
 import { HANDOFF_CHANNEL, SYNCSTATE_CHANNEL, } from "./types.js";
@@ -206,7 +206,7 @@ async function buildPlainRepo() {
 }
 async function buildKeyhiveRepo(keyhiveSyncServer) {
     initKeyhiveWasm();
-    const { hive, repo } = await initializeAutomergeRepoKeyhiveRustWithRepo({
+    const { hive, repo } = await initializeAutomergeRepoKeyhive({
         createRepo: (config) => new Repo(config),
         storage: new IndexedDBWorkerStorageAdapter(keyhiveStorageName),
         peerIdSuffix: `${storagePrefix}-worker` + Math.random().toString(36).slice(2),
@@ -536,9 +536,11 @@ async function connectPort(port, connection) {
         connection.channels.add({ adapter: mcAdapter, mcAdapter, port });
         return;
     }
-    const onlyShareWithHardcodedServerPeerId = false;
-    const periodicallyRequestKeyhiveSync = false;
-    const adapter = hive.createKeyhiveNetworkAdapter(mcAdapter, onlyShareWithHardcodedServerPeerId, periodicallyRequestKeyhiveSync, 2000);
+    const adapter = hive.createKeyhiveNetworkAdapter(mcAdapter, {
+        onlyShareWithSyncServer: false,
+        periodicallyRequestSync: false,
+        syncRequestInterval: 2000,
+    });
     adapter.on("message", (msg) => {
         if (msg.type !== "sync" && msg.type !== "request")
             return;

package/package.json

@@ -5,7 +5,7 @@
     "url": "git+https://github.com/inkandswitch/patchwork-system.git",
     "directory": "core/bootloader"
   },
-  "version": "0.6.1",
+  "version": "0.6.3",
   "author": "chee",
   "type": "module",
   "license": "MIT",
@@ -54,34 +54,34 @@
   },
   "dependencies": {
     "@automerge/automerge": "3.3.2",
-    "@automerge/automerge-repo": "2.6.0-subduction.47",
-    "@automerge/automerge-repo-keyhive": "0.3.0-alpha.sub.8b",
-    "@automerge/automerge-repo-network-messagechannel": "2.6.0-subduction.47",
-    "@automerge/automerge-repo-network-websocket": "2.6.0-subduction.47",
-    "@automerge/automerge-repo-storage-indexeddb": "2.6.0-subduction.47",
-    "@automerge/automerge-subduction": "0.16.0",
-    "@automerge/vanillajs": "2.6.0-subduction.47",
+    "@automerge/automerge-repo": "2.6.0-subduction.48",
+    "@automerge/automerge-repo-keyhive": "0.5.0-alpha.7",
+    "@automerge/automerge-repo-network-messagechannel": "2.6.0-subduction.48",
+    "@automerge/automerge-repo-network-websocket": "2.6.0-subduction.48",
+    "@automerge/automerge-repo-storage-indexeddb": "2.6.0-subduction.48",
+    "@automerge/automerge-subduction": "0.16.1",
+    "@automerge/vanillajs": "2.6.0-subduction.48",
     "@codemirror/commands": "^6.10.4",
     "@codemirror/language": "^6.12.4",
     "@codemirror/state": "^6.7.1",
     "@codemirror/view": "^6.43.6",
-    "@keyhive/keyhive": "0.1.0-alpha.5",
+    "@keyhive/keyhive": "0.1.0-alpha.8",
     "@types/debug": "^4.1.13",
     "debug": "^4.4.3",
     "resolve.exports": "^2.0.3",
     "service-worker-types": "npm:@types/serviceworker@^0.0.153",
     "solid-js": "^1.9.13",
     "tinyargs": "^0.1.4",
-    "@inkandswitch/patchwork-elements": "^6.0.0",
-    "@inkandswitch/patchwork-filesystem": "^0.2.5",
-    "@inkandswitch/patchwork-plugins": "^1.2.0",
-    "@inkandswitch/patchwork-providers": "^0.5.0"
+    "@inkandswitch/patchwork-elements": "^6.0.2",
+    "@inkandswitch/patchwork-filesystem": "^0.2.8",
+    "@inkandswitch/patchwork-plugins": "^1.2.3",
+    "@inkandswitch/patchwork-providers": "^0.5.2"
   },
   "peerDependencies": {
     "@automerge/automerge": "3.3.2",
-    "@automerge/automerge-repo": "2.6.0-subduction.47",
-    "@automerge/automerge-repo-keyhive": "0.3.0-alpha.sub.8b",
-    "@automerge/vanillajs": "2.6.0-subduction.47"
+    "@automerge/automerge-repo": "2.6.0-subduction.48",
+    "@automerge/automerge-repo-keyhive": "0.5.0-alpha.7",
+    "@automerge/vanillajs": "2.6.0-subduction.48"
   },
   "peerDependenciesMeta": {
     "@automerge/automerge": {

package/src/automerge-worker.ts

@@ -31,9 +31,9 @@ import { IndexedDBWorkerStorageAdapter } from "@automerge/automerge-repo-storage
 import { MessageChannelNetworkAdapter } from "@automerge/automerge-repo-network-messagechannel";
 import { WebSocketWorkerClientAdapter } from "@automerge/automerge-repo-network-websocket";
 import {
-  initializeAutomergeRepoKeyhiveRustWithRepo,
+  initializeAutomergeRepoKeyhive,
   initKeyhiveWasm,
-  type AutomergeRepoKeyhiveRust,
+  type AutomergeRepoKeyhive,
   type SyncServerSelection,
 } from "@automerge/automerge-repo-keyhive";
 
@@ -206,7 +206,7 @@ function getSubductionEndpoints(): WorkerWebSocketEndpoint[] {
   ]);
 }
 
-type RepoHive = { repo: Repo; hive?: AutomergeRepoKeyhiveRust };
+type RepoHive = { repo: Repo; hive?: AutomergeRepoKeyhive };
 type BuiltRepo = RepoHive & { identity?: Identity };
 
 let repoHivePromise: Promise<RepoHive> | null = null;
@@ -282,7 +282,7 @@ async function buildKeyhiveRepo(
   keyhiveSyncServer: SyncServerSelection
 ): Promise<BuiltRepo> {
   initKeyhiveWasm();
-  const { hive, repo } = await initializeAutomergeRepoKeyhiveRustWithRepo({
+  const { hive, repo } = await initializeAutomergeRepoKeyhive({
     createRepo: (config) => new Repo(config),
     storage: new IndexedDBWorkerStorageAdapter(keyhiveStorageName),
     peerIdSuffix:
@@ -685,14 +685,11 @@ async function connectPort(port: MessagePort, connection: Connection) {
     return;
   }
 
-  const onlyShareWithHardcodedServerPeerId = false;
-  const periodicallyRequestKeyhiveSync = false;
-  const adapter = hive.createKeyhiveNetworkAdapter(
-    mcAdapter,
-    onlyShareWithHardcodedServerPeerId,
-    periodicallyRequestKeyhiveSync,
-    2000
-  );
+  const adapter = hive.createKeyhiveNetworkAdapter(mcAdapter, {
+    onlyShareWithSyncServer: false,
+    periodicallyRequestSync: false,
+    syncRequestInterval: 2000,
+  });
 
   adapter.on("message", (msg: any) => {
     if (msg.type !== "sync" && msg.type !== "request") return;