server url fix, remove container

Signed-off-by: Andrey Platov <andrey@hardcoreeng.com>

cloud/app/index.ts

@@ -71,18 +71,18 @@ export const websiteUrl = siteBucket.websiteEndpoint
 
 // D O C K E R
 
-const service = new cloud.Service("dev-server", {
-  containers: {
-      server: {
-          build: "./dev-server",
-          memory: 128,
-          ports: [{ port: 3333 }],
-      },
-  },
-  replicas: 1,
-})
+// const service = new cloud.Service("dev-server", {
+//   containers: {
+//       server: {
+//           build: "./dev-server",
+//           memory: 128,
+//           ports: [{ port: 3333 }],
+//       },
+//   },
+//   replicas: 1,
+// })
 
-export const serverEndpoint = service.defaultEndpoint.hostname
+// export const serverEndpoint = service.defaultEndpoint.hostname
 
 //
 // L O G I N
@@ -95,15 +95,12 @@ const api = new awsx.apigateway.API("login", {
       path: "/",
       method: "POST",
       eventHandler: async (event) => {
-        console.log(event.body)
-        console.log(serverEndpoint.get())
-
         let body = event.body;
         if (event.isBase64Encoded) {
             body = Buffer.from(body as string, 'base64').toString()
         }
 
-        const result = handle(body, serverEndpoint.get())
+        const result = handle(body, 'wss://pacific-refuge-43514.herokuapp.com/')
         return { 
           statusCode: result.statusCode,
           headers: {

plugins/client-resources/src/index.ts

@@ -31,7 +31,7 @@ export default async () => {
       GetClient: async (token: string, endpoint: string): Promise<Client> => {
         if (client === undefined) {
           return await createClient((handler: TxHander) => {
-            const url = `ws://${endpoint}:3333/${token}`
+            const url = `${endpoint}/${token}`
             console.log('connecting to', url)
             return connect(url, handler)
           })

server/ws/src/__tests__/remote.test.ts

@@ -39,7 +39,7 @@ describe('server', () => {
   it('should send many requests', (done) => {
     const conn = connect()
     const total = 10
-    // const start = Date.now()
+    const start = Date.now()
     conn.on('open', () => {
       for (let i = 0; i < total; i++) {
         conn.send(serialize({ method: 'findAll', params: ['core:class:Class', {}], id: i }))
@@ -47,12 +47,13 @@ describe('server', () => {
     })
     let received = 0
     conn.on('message', (msg: string) => {
-      readResponse(msg)
+      const resp = readResponse(msg)
+      console.log(resp.id)
       if (++received === total) {
-        // console.log('resp:', resp, ' Time: ', Date.now() - start)
+        console.log(' Time: ', Date.now() - start)
         conn.close()
-        done()
       }
     })
+    conn.onclose = () => { console.log('closed'); done() }
   })
 })