@c15t/node-sdk 1.2.0-canary.9 → 1.2.0

package/.turbo/turbo-build.log

@@ -1,22 +1,21 @@
-
-
-> @c15t/node-sdk@1.2.0-canary.9 build /Users/christopherburns/glados/k/c15t/packages/node-sdk
-> rslib build
-
-  Rslib v0.6.2
-
-ready   built in 0.04 s (esm)
-ready   built in 0.04 s (cjs)
-start   generating declaration files... (esm)
-start   generating declaration files... (cjs)
-ready   declaration files generated in 0.59 s (esm)
-ready   declaration files generated in 0.58 s (cjs)
-
-  File (esm)       Size       
-  dist/index.js    0.78 kB
-
-  -----
-
-  File (cjs)        Size      
-  dist/index.cjs    1.8 kB
-
+
+> @c15t/node-sdk@1.2.0 build /home/runner/work/c15t/c15t/packages/node-sdk
+> rslib build
+
+  Rslib v0.6.2
+
+ready   built in 0.11 s (esm)
+ready   built in 0.11 s (cjs)
+start   generating declaration files... (esm)
+start   generating declaration files... (cjs)
+ready   declaration files generated in 5.51 s (cjs)
+ready   declaration files generated in 5.62 s (esm)
+
+  File (esm)       Size       
+  dist/index.js    0.95 kB
+
+  -----
+
+  File (cjs)        Size      
+  dist/index.cjs    1.9 kB
+

package/CHANGELOG.md

@@ -0,0 +1,12 @@
+# @c15t/node-sdk
+
+## 1.2.0
+
+### Minor Changes
+
+- [#224](https://github.com/c15t/c15t/pull/224) [`838a9b5`](https://github.com/c15t/c15t/commit/838a9b52c31326899ec3c903e43bf7bc31a6490f) Thanks [@BurnedChris](https://github.com/BurnedChris)! - Refactored backend to be a new orpc client / server
+
+### Patch Changes
+
+- Updated dependencies [[`838a9b5`](https://github.com/c15t/c15t/commit/838a9b52c31326899ec3c903e43bf7bc31a6490f)]:
+  - @c15t/backend@1.2.0

package/dist/index.cjs

@@ -26,23 +26,23 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     c15tClient: ()=>c15tClient
 });
+const contracts_namespaceObject = require("@c15t/backend/contracts");
 const client_namespaceObject = require("@orpc/client");
-const fetch_namespaceObject = require("@orpc/client/fetch");
+const fetch_namespaceObject = require("@orpc/openapi-client/fetch");
 function c15tClient(options) {
     const authHeaders = options.token ? {
         Authorization: `Bearer ${options.token}`
     } : {};
     const baseUrl = new URL(options.baseUrl);
     if (options.prefix) baseUrl.pathname = options.prefix;
-    const link = new fetch_namespaceObject.RPCLink({
+    const link = new fetch_namespaceObject.OpenAPILink(contracts_namespaceObject.contracts, {
         url: baseUrl.toString(),
         headers: {
             ...authHeaders,
             ...options.headers
         }
     });
-    const client = (0, client_namespaceObject.createORPCClient)(link);
-    return client;
+    return (0, client_namespaceObject.createORPCClient)(link);
 }
 exports.c15tClient = __webpack_exports__.c15tClient;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [

package/dist/index.d.ts

@@ -1,5 +1,6 @@
-import type { router } from '@c15t/backend/router';
-import type { RouterClient } from '@orpc/server';
+import { contracts } from '@c15t/backend/contracts';
+import type { ContractRouterClient } from '@orpc/contract';
+import type { JsonifiedClient } from '@orpc/openapi-client';
 /**
  * Configuration options for the C15T SDK client
  */
@@ -42,5 +43,5 @@ export interface C15TClientOptions {
  * const response = await client.users.getProfile({ userId: "123" });
  * ```
  */
-export declare function c15tClient(options: C15TClientOptions): RouterClient<typeof router>;
+export declare function c15tClient(options: C15TClientOptions): JsonifiedClient<ContractRouterClient<typeof contracts>>;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAGnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD;;GAEG;AACH,MAAM,WAAW,iBAAiB;IACjC;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEjC;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,iBAAiB,GA4BnC,YAAY,CAAC,OAAO,MAAM,CAAC,CAC5C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAG5D;;GAEG;AACH,MAAM,WAAW,iBAAiB;IACjC;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEjC;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,iBAAiB,GA0BnB,eAAe,CAC/C,oBAAoB,CAAC,OAAO,SAAS,CAAC,CACtC,CACD"}

package/dist/index.js

@@ -1,19 +1,19 @@
+import * as __WEBPACK_EXTERNAL_MODULE__c15t_backend_contracts_743894b8__ from "@c15t/backend/contracts";
 import * as __WEBPACK_EXTERNAL_MODULE__orpc_client_e16cd7f2__ from "@orpc/client";
-import * as __WEBPACK_EXTERNAL_MODULE__orpc_client_fetch_45535244__ from "@orpc/client/fetch";
+import * as __WEBPACK_EXTERNAL_MODULE__orpc_openapi_client_fetch_375f7e70__ from "@orpc/openapi-client/fetch";
 function c15tClient(options) {
     const authHeaders = options.token ? {
         Authorization: `Bearer ${options.token}`
     } : {};
     const baseUrl = new URL(options.baseUrl);
     if (options.prefix) baseUrl.pathname = options.prefix;
-    const link = new __WEBPACK_EXTERNAL_MODULE__orpc_client_fetch_45535244__.RPCLink({
+    const link = new __WEBPACK_EXTERNAL_MODULE__orpc_openapi_client_fetch_375f7e70__.OpenAPILink(__WEBPACK_EXTERNAL_MODULE__c15t_backend_contracts_743894b8__.contracts, {
         url: baseUrl.toString(),
         headers: {
             ...authHeaders,
             ...options.headers
         }
     });
-    const client = (0, __WEBPACK_EXTERNAL_MODULE__orpc_client_e16cd7f2__.createORPCClient)(link);
-    return client;
+    return (0, __WEBPACK_EXTERNAL_MODULE__orpc_client_e16cd7f2__.createORPCClient)(link);
 }
 export { c15tClient };

package/dist/index.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=index.test.d.ts.map

package/dist/index.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.test.d.ts","sourceRoot":"","sources":["../src/index.test.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@c15t/node-sdk",
-  "version": "1.2.0-canary.9",
+  "version": "1.2.0",
   "type": "module",
   "exports": {
     ".": {
@@ -11,8 +11,10 @@
   },
   "dependencies": {
     "@orpc/client": "1.2.0",
+    "@orpc/contract": "1.2.0",
+    "@orpc/openapi-client": "^1.2.0",
     "@orpc/server": "1.2.0",
-    "@c15t/backend": "1.2.0-canary.9"
+    "@c15t/backend": "1.2.0"
   },
   "devDependencies": {
     "@electric-sql/pglite": "0.2.17",
@@ -22,6 +24,7 @@
     "@types/node": "20.14.13",
     "@types/pg": "8.11.6",
     "kysely-pglite": "^0.6.1",
+    "msw": "^2.7.6",
     "typescript": "^5.8.3",
     "vitest": "^3.1.1",
     "@c15t/typescript-config": "0.0.1-beta.1",
@@ -32,7 +35,7 @@
     "check-types": "tsc --noEmit",
     "check-types:test": "tsc -p tsconfig.test.json",
     "dev": "rslib build --watch",
-    "fmt": "pnpm biome format --write . && biome check --formatter-enabled=false --linter-enabled=false --organize-imports-enabled=true --write",
+    "fmt": "pnpm biome format --write . && pnpm biome check --formatter-enabled=false --linter-enabled=false --organize-imports-enabled=true --write",
     "lint": "pnpm biome lint ./src",
     "test": "vitest run",
     "test:watch": "vitest"

package/src/index.test.ts

@@ -0,0 +1,218 @@
+import { createServer } from 'node:http';
+import { c15tInstance } from '@c15t/backend';
+import type { C15TOptions } from '@c15t/backend';
+import {
+	afterAll,
+	beforeAll,
+	beforeEach,
+	describe,
+	expect,
+	it,
+	vi,
+} from 'vitest';
+import { c15tClient } from './index';
+
+// Server configuration for integration tests
+const mockOptions: C15TOptions = {
+	appName: 'C15T Test Server',
+	basePath: '/',
+	trustedOrigins: ['localhost', 'test.example.com'],
+	cors: true,
+	advanced: {
+		cors: {
+			allowHeaders: ['content-type', 'x-request-id'],
+		},
+	},
+	// logger: {
+	//   level: 'debug',
+	// },
+};
+
+describe('C15T Node SDK', () => {
+	const PORT = 8787;
+	const mockBaseUrl = `http://localhost:${PORT}`;
+	let server: ReturnType<typeof c15tInstance>;
+	let httpServer: ReturnType<typeof createServer>;
+	let client: ReturnType<typeof c15tClient>;
+
+	beforeAll(async () => {
+		// Initialize the server for integration tests
+		server = c15tInstance(mockOptions);
+
+		// Create and start HTTP server
+		httpServer = createServer(async (req, res) => {
+			try {
+				// Read request body if present
+				let body: string | undefined;
+				if (req.method !== 'GET' && req.method !== 'HEAD') {
+					const chunks: Uint8Array[] = [];
+					for await (const chunk of req) {
+						chunks.push(chunk);
+					}
+					body = Buffer.concat(chunks).toString();
+				}
+
+				// Convert Node.js request to web standard Request
+				const request = new Request(`http://localhost:${PORT}${req.url}`, {
+					method: req.method,
+					headers: req.headers as Record<string, string>,
+					body: body,
+					duplex: 'half',
+				});
+
+				// Handle the request with c15tInstance
+				const response = await server.handler(request);
+
+				// Set response status and headers
+				res.statusCode = response.status;
+				for (const [key, value] of response.headers.entries()) {
+					res.setHeader(key, value);
+				}
+
+				// Ensure content-type is set for JSON responses
+				if (!response.headers.get('content-type')) {
+					res.setHeader('content-type', 'application/json');
+				}
+
+				// Get response body
+				const responseBody = await response.text();
+
+				// Send response
+				res.end(responseBody);
+			} catch (error) {
+				// biome-ignore lint/suspicious/noConsoleLog: its a test
+				// biome-ignore lint/suspicious/noConsole: its a test
+				console.error('Server error:', error);
+				res.statusCode = 500;
+				res.setHeader('content-type', 'application/json');
+				res.end(
+					JSON.stringify({
+						error: 'Internal Server Error',
+						message: error instanceof Error ? error.message : String(error),
+					})
+				);
+			}
+		});
+
+		await new Promise<void>((resolve) => {
+			httpServer.listen(PORT, () => {
+				// biome-ignore lint/suspicious/noConsoleLog: its a test
+				// biome-ignore lint/suspicious/noConsole: its a test
+				console.log(`Test server listening on port ${PORT}`);
+				resolve();
+			});
+		});
+
+		// Initialize the client for testing
+		client = c15tClient({
+			baseUrl: mockBaseUrl,
+			prefix: '/',
+		});
+	});
+
+	afterAll(async () => {
+		// Clean up server
+		await new Promise<void>((resolve) => {
+			httpServer.close(() => {
+				// biome-ignore lint/suspicious/noConsoleLog: its a test
+				// biome-ignore lint/suspicious/noConsole: its a test
+				console.log('Test server closed');
+				resolve();
+			});
+		});
+	});
+
+	beforeEach(() => {
+		vi.clearAllMocks();
+	});
+
+	describe('Unit Tests', () => {
+		describe('Client Creation', () => {
+			it('should create a client with basic configuration', () => {
+				const client = c15tClient({ baseUrl: mockBaseUrl });
+
+				expect(client).toBeDefined();
+				expect(client.consent).toBeDefined();
+				expect(client.meta).toBeDefined();
+			});
+
+			it('should include authorization header when token is provided', () => {
+				const client = c15tClient({
+					baseUrl: mockBaseUrl,
+					token: 'test-token',
+				});
+
+				expect(client).toBeDefined();
+			});
+
+			it('should include custom headers when provided', () => {
+				const client = c15tClient({
+					baseUrl: mockBaseUrl,
+					headers: { 'X-Custom-Header': 'test-value' },
+				});
+
+				expect(client).toBeDefined();
+			});
+
+			it('should apply prefix to base URL when provided', () => {
+				const prefix = '/api/v1';
+				const client = c15tClient({
+					baseUrl: mockBaseUrl,
+					prefix,
+				});
+
+				expect(client).toBeDefined();
+			});
+
+			it('should handle URL with existing path', () => {
+				const baseUrl = 'http://localhost:8787/existing';
+				const prefix = '/api/v1';
+				const client = c15tClient({
+					baseUrl,
+					prefix,
+				});
+
+				expect(client).toBeDefined();
+			});
+		});
+
+		describe('Error Handling', () => {
+			it('should handle invalid base URL', () => {
+				expect(() => {
+					c15tClient({ baseUrl: 'invalid-url' });
+				}).toThrow();
+			});
+
+			it('should handle empty base URL', () => {
+				expect(() => {
+					c15tClient({ baseUrl: '' });
+				}).toThrow();
+			});
+		});
+	});
+
+	describe('Integration Tests', () => {
+		it('should connect to status endpoint', async () => {
+			const response = await client.meta.status();
+
+			// Test exact structure based on actual response
+			expect(response).toEqual({
+				status: 'ok',
+				version: expect.any(String),
+				timestamp: expect.any(String),
+				storage: {
+					type: 'memory',
+					available: true,
+				},
+				client: {
+					ip: expect.any(String),
+					userAgent: expect.any(String),
+					region: {
+						countryCode: null,
+						regionCode: null,
+					},
+				},
+			});
+		});
+	});
+});

package/src/index.ts

@@ -1,7 +1,8 @@
-import type { router } from '@c15t/backend/router';
+import { contracts } from '@c15t/backend/contracts';
 import { createORPCClient } from '@orpc/client';
-import { RPCLink } from '@orpc/client/fetch';
-import type { RouterClient } from '@orpc/server';
+import type { ContractRouterClient } from '@orpc/contract';
+import type { JsonifiedClient } from '@orpc/openapi-client';
+import { OpenAPILink } from '@orpc/openapi-client/fetch';
 
 /**
  * Configuration options for the C15T SDK client
@@ -63,8 +64,7 @@ export function c15tClient(options: C15TClientOptions) {
 		baseUrl.pathname = options.prefix;
 	}
 
-	// Create the RPC link with the configured options
-	const link = new RPCLink({
+	const link = new OpenAPILink(contracts, {
 		url: baseUrl.toString(),
 		headers: {
 			...authHeaders,
@@ -75,7 +75,8 @@ export function c15tClient(options: C15TClientOptions) {
 	// Create and return the client with a type assertion
 	// This approach avoids complex type issues while providing
 	// the same runtime functionality
-	const client = createORPCClient(link);
 
-	return client as RouterClient<typeof router>;
+	return createORPCClient(link) as JsonifiedClient<
+		ContractRouterClient<typeof contracts>
+	>;
 }

package/.turbo/turbo-fmt.log

@@ -1,7 +0,0 @@
-
-
-> @c15t/node-sdk@1.2.0-canary.9 fmt /Users/christopherburns/glados/k/c15t/packages/node-sdk
-> pnpm biome format --write . && biome check --formatter-enabled=false --linter-enabled=false --organize-imports-enabled=true --write
-
-Formatted 5 files in 68ms. No fixes applied.
-Checked 5 files in 4ms. No fixes applied.