Merge branch 'main' into feat/post

Author: MathurAditya724

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
       pull-requests: write
     steps:
       - uses: actions/checkout@v4
-      - run: corepack enable
+      - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
           node-version: 20

.github/workflows/update-lexicons.yml

@@ -6,6 +6,8 @@ on:
   push:
     branches:
       - main
+  schedule:
+    - cron: '0 * * * *'
   workflow_dispatch: {}
   merge_group: {}
 
@@ -19,7 +21,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref || github.ref_name }}
-      - run: corepack enable
+      - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
           node-version: 20

package.json

@@ -13,7 +13,7 @@
   "scripts": {
     "dev": "pnpm run -r dev",
     "build": "pnpm run -r build",
-    "prepare": "pnpm build",
+    "prepare": "pnpm --filter !@tsky/docs build",
     "docs:dev": "pnpm run --filter @tsky/docs dev",
     "docs:build": "pnpm run --filter @tsky/docs build",
     "docs:preview": "pnpm run --filter @tsky/docs preview",

packages/client/globalSetup.ts

@@ -0,0 +1,46 @@
+import type { TestProject } from 'vitest/node';
+
+import { CredentialManager, XRPC } from '@atcute/client';
+import { TestNetwork } from '@atcute/internal-dev-env';
+
+let network: TestNetwork;
+
+export async function setup(project: TestProject) {
+  network = await TestNetwork.create({});
+  console.log(
+    `🌐 Created test network:\n- pds: ${network.pds.url}\n- plc: ${network.plc.url}`,
+  );
+
+  const manager = new CredentialManager({ service: network.pds.url });
+  const rpc = new XRPC({
+    handler: manager,
+  });
+
+  await createAccount(rpc, 'alice.test');
+  await createAccount(rpc, 'bob.test');
+
+  project.provide('testPdsUrl', network.pds.url);
+  project.provide('testPlcUrl', network.plc.url);
+}
+
+export async function teardown() {
+  await network.close();
+}
+
+const createAccount = async (rpc: XRPC, handle: string) => {
+  await rpc.call('com.atproto.server.createAccount', {
+    data: {
+      handle: handle,
+      email: `${handle}@example.com`,
+      password: 'password',
+    },
+  });
+  console.log(`🙋 Created new account: @${handle}`);
+};
+
+declare module 'vitest' {
+  export interface ProvidedContext {
+    testPdsUrl: string;
+    testPlcUrl: string;
+  }
+}

packages/client/package.json

@@ -35,12 +35,13 @@
     "@atcute/client": "^2.0.6"
   },
   "devDependencies": {
+    "@atcute/internal-dev-env": "workspace:*",
     "@tsky/lexicons": "workspace:*",
     "@vitest/coverage-istanbul": "2.1.6",
     "globals": "^15.12.0",
     "pkgroll": "^2.5.1",
     "tsx": "^4.19.2",
-    "typescript": "^5.7.2",
-    "vitest": "^2.1.6"
+    "typescript": "catalog:",
+    "vitest": "^3.0.5"
   }
 }

packages/client/src/tsky/tsky.test.ts

@@ -0,0 +1,45 @@
+import { describe, expect, inject, it } from 'vitest';
+
+import type { AtpSessionData } from '@atcute/client';
+
+import { createAgent } from '~/tsky';
+
+describe('createAgent', () => {
+  it('can create agent for Alice', async () => {
+    const agent = await createAgent(
+      {
+        identifier: 'alice.test',
+        password: 'password',
+      },
+      { service: inject('testPdsUrl') },
+    );
+    expect(agent.session).not.toBe(undefined);
+    expect(agent.session?.handle).toBe('alice.test');
+    expect(agent.session?.email).toBe('alice.test@example.com');
+  });
+
+  it('can resume from stored session', async () => {
+    let session: AtpSessionData;
+    {
+      const agent = await createAgent(
+        {
+          identifier: 'alice.test',
+          password: 'password',
+        },
+        { service: inject('testPdsUrl') },
+      );
+      expect(agent.session).toBeDefined();
+      session = agent.session as AtpSessionData;
+    }
+
+    {
+      const agent = await createAgent(
+        { session },
+        { service: inject('testPdsUrl') },
+      );
+      expect(agent.session).not.toBe(undefined);
+      expect(agent.session?.handle).toBe('alice.test');
+      expect(agent.session?.email).toBe('alice.test@example.com');
+    }
+  });
+});

packages/client/src/tsky/tsky.ts

@@ -13,8 +13,11 @@ export async function createAgent(
     options ?? { service: 'https://bsky.social' },
   );
 
-  if ('session' in credentials) manager.resume(credentials.session);
-  else await manager.login(credentials);
+  if ('session' in credentials) {
+    await manager.resume(credentials.session);
+  } else {
+    await manager.login(credentials);
+  }
 
   return new Agent(manager);
 }

packages/client/test-utils.ts

@@ -0,0 +1,30 @@
+import { inject } from 'vitest';
+
+import type { Agent } from '~/agent';
+import { createAgent } from '~/tsky';
+
+type Handle = 'alice.test' | 'bob.test';
+
+const testAgents: Record<Handle, Agent> = {
+  'alice.test': await createTestAgent('alice.test'),
+  'bob.test': await createTestAgent('bob.test'),
+};
+
+function createTestAgent(handle: Handle) {
+  return createAgent(
+    {
+      identifier: handle,
+      password: 'password',
+    },
+    { service: inject('testPdsUrl') },
+  );
+}
+
+/**
+ * Get Agent instance for testing accounts.
+ * There are `@alice.test` and `@bob.test` now.
+ * @param handle - handle name for test agent (without `@`)
+ */
+export async function getTestAgent(handle: Handle) {
+  return testAgents[handle];
+}

packages/client/tsconfig.json

@@ -10,6 +10,7 @@
     "moduleResolution": "bundler",
     "paths": {
       "~/*": ["src/*"],
+      "~~/*": ["*"],
       "@tsky/lexicons": ["../lexicons/index.ts"],
     },
     "resolveJsonModule": true,
@@ -31,7 +32,7 @@
     "verbatimModuleSyntax": true,
     "skipLibCheck": true
   },
-  "include": ["./src/**/*", "./tests/**/*", "./test-utils/**/*"],
+  "include": ["./src/**/*", "./globalSetup.ts", "./test-utils.ts"],
   "typedocOptions": {
     "out": "./docs",
     "theme": "default",

packages/client/vitest.config.mts

@@ -2,6 +2,7 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
   test: {
+    globalSetup: 'globalSetup.ts',
     coverage: {
       provider: 'istanbul',
       reporter: ['text', 'json-summary', 'json', 'html'],
@@ -11,6 +12,7 @@ export default defineConfig({
   resolve: {
     alias: {
       '~': '/src',
+      '~~': '/',
     },
   },
 });