@dbos-inc/koa-serve 3.5.44-preview.gc094fdab44 → 3.6.3-preview

package/tests/endpoints.test.ts

@@ -2,7 +2,7 @@
 import Koa from 'koa';
 import Router from '@koa/router';
 
-import { DBOS, Error as DBOSErrors, StatusString } from '@dbos-inc/dbos-sdk';
+import { DBOS, DBOSResponseError, Error as DBOSErrors, StatusString } from '@dbos-inc/dbos-sdk';
 
 import { DBOSKoa, DBOSKoaAuthContext, RequestIDHeader, WorkflowIDHeader } from '../src';
 
@@ -10,6 +10,11 @@ import request from 'supertest';
 
 const dhttp = new DBOSKoa();
 
+interface TestKvTable {
+  id?: number;
+  value?: string;
+}
+
 import { randomUUID } from 'node:crypto';
 import { IncomingMessage } from 'http';
 import { bodyParser } from '@koa/bodyparser';
@@ -24,9 +29,12 @@ describe('httpserver-tests', () => {
   let app: Koa;
   let appRouter: Router;
 
+  const testTableName = 'dbos_test_kv';
+
   beforeAll(async () => {
     DBOS.setConfig({
       name: 'dbos-koa-test',
+      userDatabaseClient: 'pg-node',
     });
     return Promise.resolve();
   });
@@ -34,6 +42,8 @@ describe('httpserver-tests', () => {
   beforeEach(async () => {
     const _classes = [TestEndpoints];
     await DBOS.launch();
+    await DBOS.queryUserDB(`DROP TABLE IF EXISTS ${testTableName};`);
+    await DBOS.queryUserDB(`CREATE TABLE IF NOT EXISTS ${testTableName} (id INT PRIMARY KEY, value TEXT);`);
     app = new Koa();
     appRouter = new Router();
     dhttp.registerWithApp(app, appRouter);
@@ -97,12 +107,17 @@ describe('httpserver-tests', () => {
   });
 
   test('post-test-custom-body', async () => {
-    const response = await request(app.callback())
+    let response = await request(app.callback())
       .post('/testpost')
       .set('Content-Type', 'application/custom-content-type')
       .send(JSON.stringify({ name: 'alice' }));
     expect(response.statusCode).toBe(200);
     expect(response.text).toBe('hello alice');
+    response = await request(app.callback())
+      .post('/testpost')
+      .set('Content-Type', 'application/rejected-custom-content-type')
+      .send(JSON.stringify({ name: 'alice' }));
+    expect(response.statusCode).toBe(400);
   });
 
   test('put-test', async () => {
@@ -112,12 +127,17 @@ describe('httpserver-tests', () => {
   });
 
   test('put-test-custom-body', async () => {
-    const response = await request(app.callback())
+    let response = await request(app.callback())
       .put('/testput')
       .set('Content-Type', 'application/custom-content-type')
       .send(JSON.stringify({ name: 'alice' }));
     expect(response.statusCode).toBe(200);
     expect(response.text).toBe('hello alice');
+    response = await request(app.callback())
+      .put('/testput')
+      .set('Content-Type', 'application/rejected-custom-content-type')
+      .send(JSON.stringify({ name: 'alice' }));
+    expect(response.statusCode).toBe(400);
   });
 
   test('patch-test', async () => {
@@ -127,12 +147,23 @@ describe('httpserver-tests', () => {
   });
 
   test('patch-test-custom-body', async () => {
-    const response = await request(app.callback())
+    let response = await request(app.callback())
       .patch('/testpatch')
       .set('Content-Type', 'application/custom-content-type')
       .send(JSON.stringify({ name: 'alice' }));
     expect(response.statusCode).toBe(200);
     expect(response.text).toBe('hello alice');
+    response = await request(app.callback())
+      .patch('/testpatch')
+      .set('Content-Type', 'application/rejected-custom-content-type')
+      .send(JSON.stringify({ name: 'alice' }));
+    expect(response.statusCode).toBe(400);
+  });
+
+  test('endpoint-transaction', async () => {
+    const response = await request(app.callback()).post('/transaction/alice');
+    expect(response.statusCode).toBe(200);
+    expect(response.text).toBe('hello 1');
   });
 
   test('endpoint-step', async () => {
@@ -144,30 +175,31 @@ describe('httpserver-tests', () => {
   test('endpoint-workflow', async () => {
     const response = await request(app.callback()).post('/workflow?name=alice');
     expect(response.statusCode).toBe(200);
-    expect(response.text).toBe('alice');
+    expect(response.text).toBe('hello 1');
   });
 
   test('endpoint-error', async () => {
     const response = await request(app.callback()).post('/error').send({ name: 'alice' });
     expect(response.statusCode).toBe(500);
+    expect(response.body.details.code).toBe('23505'); // Should be the expected error.
   });
 
   test('endpoint-handler', async () => {
     const response = await request(app.callback()).get('/handler/alice');
     expect(response.statusCode).toBe(200);
-    expect(response.text).toBe('alice');
+    expect(response.text).toBe('hello 1');
   });
 
   test('endpoint-testStartWorkflow', async () => {
     const response = await request(app.callback()).get('/testStartWorkflow/alice');
     expect(response.statusCode).toBe(200);
-    expect(response.text).toBe('alice');
+    expect(response.text).toBe('hello 1');
   });
 
   test('endpoint-testInvokeWorkflow', async () => {
     const response = await request(app.callback()).get('/testInvokeWorkflow/alice');
     expect(response.statusCode).toBe(200);
-    expect(response.text).toBe('alice');
+    expect(response.text).toBe('hello 1');
   });
 
   // This feels unclean, but supertest doesn't expose the error message the people we want. See:
@@ -178,11 +210,17 @@ describe('httpserver-tests', () => {
 
   test('response-error', async () => {
     const response = await request(app.callback()).get('/dbos-error');
-    expect(response.statusCode).toBe(500);
+    expect(response.statusCode).toBe(503);
     expect((response as unknown as Res).res.statusMessage).toBe('customize error');
     expect(response.body.message).toBe('customize error');
   });
 
+  test('datavalidation-error', async () => {
+    const response = await request(app.callback()).get('/query');
+    expect(response.statusCode).toBe(400);
+    expect(response.body.details.dbosErrorCode).toBe(9);
+  });
+
   test('dbos-redirect', async () => {
     const response = await request(app.callback()).get('/redirect');
     expect(response.statusCode).toBe(302);
@@ -210,17 +248,17 @@ describe('httpserver-tests', () => {
 
   test('not-authenticated', async () => {
     const response = await request(app.callback()).get('/requireduser?name=alice');
-    expect(response.statusCode).toBe(500);
+    expect(response.statusCode).toBe(401);
   });
 
   test('not-you', async () => {
     const response = await request(app.callback()).get('/requireduser?name=alice&userid=go_away');
-    expect(response.statusCode).toBe(500);
+    expect(response.statusCode).toBe(401);
   });
 
   test('not-authorized', async () => {
     const response = await request(app.callback()).get('/requireduser?name=alice&userid=bob');
-    expect(response.statusCode).toBe(500);
+    expect(response.statusCode).toBe(403);
   });
 
   test('authorized', async () => {
@@ -230,17 +268,17 @@ describe('httpserver-tests', () => {
 
   test('not-authenticated2', async () => {
     const response = await request(app.callback()).get('/requireduser2?name=alice');
-    expect(response.statusCode).toBe(500);
+    expect(response.statusCode).toBe(401);
   });
 
   test('not-you2', async () => {
     const response = await request(app.callback()).get('/requireduser2?name=alice&userid=go_away');
-    expect(response.statusCode).toBe(500);
+    expect(response.statusCode).toBe(401);
   });
 
   test('not-authorized2', async () => {
     const response = await request(app.callback()).get('/requireduser2?name=alice&userid=bob');
-    expect(response.statusCode).toBe(500);
+    expect(response.statusCode).toBe(403);
   });
 
   test('authorized2', async () => {
@@ -254,12 +292,12 @@ describe('httpserver-tests', () => {
       .post('/workflow?name=bob')
       .set({ 'dbos-idempotency-key': workflowID });
     expect(response.statusCode).toBe(200);
-    expect(response.text).toBe('bob');
+    expect(response.text).toBe('hello 1');
 
     // Retrieve the workflow with WFID.
     const retrievedHandle = DBOS.retrieveWorkflow(workflowID);
     expect(retrievedHandle).not.toBeNull();
-    await expect(retrievedHandle.getResult()).resolves.toBe('bob');
+    await expect(retrievedHandle.getResult()).resolves.toBe('hello 1');
     await expect(retrievedHandle.getStatus()).resolves.toMatchObject({
       status: StatusString.SUCCESS,
     });
@@ -269,12 +307,12 @@ describe('httpserver-tests', () => {
     const workflowID = randomUUID();
     const response = await request(app.callback()).get('/handler/bob').set({ 'dbos-idempotency-key': workflowID });
     expect(response.statusCode).toBe(200);
-    expect(response.text).toBe('bob');
+    expect(response.text).toBe('hello 1');
 
     // Retrieve the workflow with WFID.
     const retrievedHandle = DBOS.retrieveWorkflow(workflowID);
     expect(retrievedHandle).not.toBeNull();
-    await expect(retrievedHandle.getResult()).resolves.toBe('bob');
+    await expect(retrievedHandle.getResult()).resolves.toBe('hello 1');
     await expect(retrievedHandle.getStatus()).resolves.toMatchObject({
       status: StatusString.SUCCESS,
     });
@@ -311,6 +349,7 @@ describe('httpserver-tests', () => {
       parsedMethods: ['POST', 'PUT', 'PATCH', 'GET', 'DELETE'],
     }),
   )
+  @DBOSKoa.defaultArgRequired
   class TestEndpoints {
     @dhttp.getApi('/hello')
     static async hello() {
@@ -339,12 +378,6 @@ describe('httpserver-tests', () => {
       return Promise.resolve(url);
     }
 
-    @dhttp.getApi('/dbos-error')
-    @DBOS.workflow()
-    static async dbosErr() {
-      return Promise.reject(new Error('customize error'));
-    }
-
     @dhttp.getApi('/query')
     static async helloQuery(name: string) {
       DBOS.logger.info(`query with name ${name}`); // Test logging.
@@ -390,6 +423,12 @@ describe('httpserver-tests', () => {
       return Promise.resolve(`hello ${name}`);
     }
 
+    @dhttp.getApi('/dbos-error')
+    @DBOS.transaction()
+    static async dbosErr() {
+      return Promise.reject(new DBOSResponseError('customize error', 503));
+    }
+
     @dhttp.getApi('/handler/:name')
     static async testHandler(name: string) {
       const workflowID: string = DBOSKoa.koaContext.get(WorkflowIDHeader);
@@ -411,6 +450,16 @@ describe('httpserver-tests', () => {
       return await TestEndpoints.testWorkflow(name);
     }
 
+    @dhttp.postApi('/transaction/:name')
+    @DBOS.transaction()
+    static async testTransaction(name: string) {
+      const { rows } = await DBOS.pgClient.query<TestKvTable>(
+        `INSERT INTO ${testTableName}(id, value) VALUES (1, $1) RETURNING id`,
+        [name],
+      );
+      return `hello ${rows[0].id}`;
+    }
+
     @dhttp.getApi('/step/:input')
     @DBOS.step()
     static async testStep(input: string) {
@@ -420,27 +469,30 @@ describe('httpserver-tests', () => {
     @dhttp.postApi('/workflow')
     @DBOS.workflow()
     static async testWorkflow(name: string) {
-      return TestEndpoints.testStep(name);
+      const res = await TestEndpoints.testTransaction(name);
+      return TestEndpoints.testStep(res);
     }
 
     @dhttp.postApi('/error')
     @DBOS.workflow()
     static async testWorkflowError(name: string) {
-      await Promise.resolve();
-      throw Error(name);
+      // This workflow should encounter duplicate primary key error.
+      let res = await TestEndpoints.testTransaction(name);
+      res = await TestEndpoints.testTransaction(name);
+      return res;
     }
 
     @dhttp.getApi('/requireduser')
     @DBOS.requiredRole(['user'])
     static async testAuth(name: string) {
       if (DBOS.authenticatedUser !== 'a_real_user') {
-        throw new Error('uid not a real user!');
+        throw new DBOSResponseError('uid not a real user!', 400);
       }
       if (!DBOS.authenticatedRoles.includes('user')) {
-        throw new Error("roles don't include user!");
+        throw new DBOSResponseError("roles don't include user!", 400);
       }
       if (DBOS.assumedRole !== 'user') {
-        throw new Error('Should never happen! Not assumed to be user');
+        throw new DBOSResponseError('Should never happen! Not assumed to be user', 400);
       }
       return Promise.resolve(`Please say hello to ${name}`);
     }
@@ -449,13 +501,13 @@ describe('httpserver-tests', () => {
     @DBOS.requiredRole(['user'])
     static async testAuth2(name: string) {
       if (DBOS.authenticatedUser !== 'a_real_user') {
-        throw new Error('uid not a real user!');
+        throw new DBOSResponseError('uid not a real user!', 400);
       }
       if (!DBOS.authenticatedRoles.includes('user')) {
-        throw new Error("roles don't include user!");
+        throw new DBOSResponseError("roles don't include user!", 400);
       }
       if (DBOS.assumedRole !== 'user') {
-        throw new Error('Should never happen! Not assumed to be user');
+        throw new DBOSResponseError('Should never happen! Not assumed to be user', 400);
       }
       return Promise.resolve(`Please say hello to ${name}`);
     }

package/tests/steps.test.ts

@@ -56,9 +56,14 @@ describe('registerstep', () => {
     expect(response1.statusCode).toBe(200);
     const response2 = await request(app.callback()).get('/api/i2?user=jeremy');
     expect(response2.statusCode).toBe(200);
+    const response3 = await request(app.callback()).get('/api/i1');
+    expect(response3.statusCode).toBe(400);
+    const response4 = await request(app.callback()).get('/api/i2');
+    expect(response4.statusCode).toBe(400);
   });
 });
 
+@DBOSKoa.defaultArgValidate
 class KnexKoa {
   @customstep()
   @dhttp.getApi('/api/i2')

package/tests/transactions.test.ts

@@ -77,9 +77,14 @@ describe('KnexDataSource', () => {
     expect(response1.statusCode).toBe(200);
     const response2 = await request(app.callback()).get('/api/i2?user=jeremy');
     expect(response2.statusCode).toBe(200);
+    const response3 = await request(app.callback()).get('/api/i1');
+    expect(response3.statusCode).toBe(400);
+    const response4 = await request(app.callback()).get('/api/i2');
+    expect(response4.statusCode).toBe(400);
   });
 });
 
+@DBOSKoa.defaultArgValidate
 class KnexKoa {
   @knexds.transaction()
   @dhttp.getApi('/api/i2')