env updates

desci-labs · Nov 25, 2024 · e4ca21e · e4ca21e
1 parent 8f6cf1a
commit e4ca21e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/desci-repo/kubernetes/deployment_dev.yaml b/desci-repo/kubernetes/deployment_dev.yaml
@@ -49,6 +49,8 @@ spec:
           export DATABASE_URL={{ .Data.DATABASE_URL }}
           export IPFS_RESOLVER_OVERRIDE={{ .Data.IPFS_RESOLVER_OVERRIDE }}
           export DESCI_SERVER_URL={{ .Data.DESCI_SERVER_URL }}
+          export PARTY_SERVER_URL={{ .Data.PARTY_SERVER_URL }}
+          export PARTY_SERVER_TOKEN={{ .Data.PARTY_SERVER_TOKEN }}
           export PINO_LOG_LEVEL=info
           {{- end -}}
       labels:

diff --git a/desci-repo/kubernetes/deployment_prod.yaml b/desci-repo/kubernetes/deployment_prod.yaml
@@ -50,6 +50,8 @@ spec:
           export DATABASE_URL={{ .Data.DATABASE_URL }}
           export IPFS_RESOLVER_OVERRIDE={{ .Data.IPFS_RESOLVER_OVERRIDE }}
           export DESCI_SERVER_URL={{ .Data.DESCI_SERVER_URL }}
+          export PARTY_SERVER_URL={{ .Data.PARTY_SERVER_URL }}
+          export PARTY_SERVER_TOKEN={{ .Data.PARTY_SERVER_TOKEN }}
           export PINO_LOG_LEVEL=info
           {{- end -}}
       labels:

diff --git a/desci-repo/kubernetes/deployment_staging.yaml b/desci-repo/kubernetes/deployment_staging.yaml
@@ -50,6 +50,8 @@ spec:
           export DATABASE_URL={{ .Data.DATABASE_URL }}
           export IPFS_RESOLVER_OVERRIDE={{ .Data.IPFS_RESOLVER_OVERRIDE }}
           export DESCI_SERVER_URL={{ .Data.DESCI_SERVER_URL }}
+          export PARTY_SERVER_URL={{ .Data.PARTY_SERVER_URL }}
+          export PARTY_SERVER_TOKEN={{ .Data.PARTY_SERVER_TOKEN }}
           export PINO_LOG_LEVEL=info
           {{- end -}}
       labels:

diff --git a/desci-repo/src/repo.ts b/desci-repo/src/repo.ts
@@ -21,7 +21,7 @@ const isDev = process.env.NODE_ENV == 'dev';
 const isTest = process.env.NODE_ENV == 'test';
 
 if (!(partyServerToken && partyServerHost)) {
-  throw new Error('Missing ENVIRONMENT variables: AUTOMERGE_PARTY_URL or AUTOMERGE_PARTY_TOKEN');
+  throw new Error('Missing ENVIRONMENT variables: PARTY_SERVER_URL or PARTY_SERVER_TOKEN');
 }
 
 const logger = parentLogger.child({ module: 'repo.ts' });

diff --git a/sync-server/src/index.ts b/sync-server/src/index.ts
@@ -16,7 +16,7 @@ export class AutomergeServer extends PartyServer {
   // };
 
   repo: Repo;
-  private AUTH_SECRET: string;
+  private API_TOKEN: string;
   private DATABASE_URL: string;
   private environment: string;
 
@@ -33,7 +33,7 @@ export class AutomergeServer extends PartyServer {
     const localDbUrl =
       this.env.DATABASE_URL ?? process.env.WRANGLER_HYPERDRIVE_LOCAL_CONNECTION_STRING_NODES_DB ?? '<DATABASE_URL>';
     this.DATABASE_URL = this.environment === 'dev' ? localDbUrl : this.env.NODES_DB.connectionString;
-    this.AUTH_SECRET = env.API_TOKEN || 'auth-token';
+    this.API_TOKEN = env.API_TOKEN || 'auth-token';
   }
 
   async onStart(): Promise<void> {
@@ -60,7 +60,7 @@ export class AutomergeServer extends PartyServer {
     const auth = params.get('auth');
     let isAuthorised = false;
 
-    if (auth === this.AUTH_SECRET) {
+    if (auth === this.API_TOKEN) {
       isAuthorised = true;
     } else {
       // Add default for missing NODES_API in workered container runtime
@@ -74,25 +74,24 @@ export class AutomergeServer extends PartyServer {
       if (response.ok) isAuthorised = true;
     }
 
-    console.log('onConnect', { isAuthorised, id: connection.id, server: connection.server });
     if (isAuthorised) {
       this.repo.networkSubsystem.addNetworkAdapter(new PartyKitWSServerAdapter(connection));
     } else {
+      console.log('Auth declined', { id: connection.id, server: connection.server });
       connection.close();
     }
   }
 
   onMessage(connection: Connection, message: WSMessage): void | Promise<void> {
     this.broadcast(message, [connection.id]);
-    // console.log('[peers]:', this.repo.peers);
   }
 
   onError(connection: Connection, error: unknown): void | Promise<void> {
     console.log('[Error]:', { id: connection.id, error: serialiseErr(error as Error) });
   }
 
   onClose(connection: Connection, code: number, reason: string, wasClean: boolean): void | Promise<void> {
-    console.log('[close]:', { id: connection.id, url: connection.url, documentId: connection.server });
+    console.info('[close]:', { id: connection.id, url: connection.url, documentId: connection.server });
     try {
       connection.close();
     } catch (err) {