Merge pull request #127 from KyleAMathews/main

fix(jazz-nodejs): also set peersToLoadFrom on newly created accounts

.github/workflows/build-and-deploy.yaml

@@ -115,7 +115,7 @@ jobs:
 
         envsubst '${DOCKER_USER} ${DOCKER_PASSWORD} ${DOCKER_TAG} ${BRANCH_SUFFIX} ${BRANCH_SUBDOMAIN}' < job-template.nomad > job-instance.nomad;
         cat job-instance.nomad;
-        NOMAD_ADDR='http://control1v2-london:4646' nomad job run job-instance.nomad;
+        NOMAD_ADDR=${{ secrets.NOMAD_ADDR }} nomad job run job-instance.nomad;
       working-directory: ./examples/${{ matrix.example }}
 
   # deploy-homepage:
@@ -148,5 +148,5 @@ jobs:
 
   #       envsubst '${DOCKER_USER} ${DOCKER_PASSWORD} ${DOCKER_TAG} ${BRANCH_SUFFIX} ${BRANCH_SUBDOMAIN}' < job-template.nomad > job-instance.nomad;
   #       cat job-instance.nomad;
-  #       NOMAD_ADDR='http://control1v2-london:4646' nomad job run job-instance.nomad;
+  #       NOMAD_ADDR=${{ secrets.NOMAD_ADDR }} nomad job run job-instance.nomad;
   #     working-directory: ./homepage/homepage-jazz

packages/cojson/src/localNode.ts

@@ -74,10 +74,12 @@ export class LocalNode {
         Meta extends AccountMeta = AccountMeta
     >({
         name,
+        peersToLoadFrom,
         migration,
         initialAgentSecret = newRandomAgentSecret(),
     }: {
         name: string;
+        peersToLoadFrom?: Peer[];
         migration?: AccountMigration<P, R, Meta>;
         initialAgentSecret?: AgentSecret;
     }): Promise<{
@@ -107,6 +109,12 @@ export class LocalNode {
             "After creating account"
         );
 
+        if (peersToLoadFrom) {
+            for (const peer of peersToLoadFrom) {
+                nodeWithAccount.syncManager.addPeer(peer);
+            }
+        }
+
         if (migration) {
             await migration(accountOnNodeWithAccount, profile as P, nodeWithAccount);
         }

packages/jazz-nodejs/src/index.ts

@@ -94,13 +94,12 @@ export async function createOrResumeWorker<
     } else {
         const newWorker = await LocalNode.withNewlyCreatedAccount({
             name: workerName,
+            peersToLoadFrom: [wsPeer],
             migration,
         });
 
         localNode = newWorker.node;
 
-        localNode.syncManager.addPeer(wsPeer);
-
         await credentialStorage.save(
             workerName,
             newWorker.accountID,