fix: ensure websockets work by fixing casting issue (#25)

* fix: export common resources

Ensures permissions are included when importing nitric

* fix: rename sendMessage to send for websockets

* fix: rename closeConnection to close

* fix: ensure websocker handler client is defined

* fix imports

Author: davemooreuws

lib/nitric.dart

@@ -2,3 +2,4 @@ library;
 
 export 'src/nitric.dart';
 export 'src/context/common.dart';
+export 'src/resources/common.dart';

lib/src/resources/websocket.dart

@@ -16,7 +16,12 @@ class Websocket extends Resource {
       _websocketClient = websocketClient;
     }
 
-    _websocketHandlerClient = websocketHandlerClient;
+    if (websocketHandlerClient == null) {
+      _websocketHandlerClient = $wp.WebsocketHandlerClient(
+          ClientChannelSingleton.instance.clientChannel);
+    } else {
+      _websocketHandlerClient = websocketHandlerClient;
+    }
   }
 
   @override
@@ -30,14 +35,14 @@ class Websocket extends Resource {
   }
 
   /// Send message [data] to a connection, referenced by its [connectionId].
-  Future<void> sendMessage(String connectionId, String data) async {
+  Future<void> send(String connectionId, String data) async {
     var req = $wp.WebsocketSendRequest(
         socketName: name, connectionId: connectionId, data: utf8.encode(data));
     await _websocketClient.sendMessage(req);
   }
 
   /// Close a connection to the socket, referenced by its [connectionId].
-  Future<void> closeConnection(String connectionId) async {
+  Future<void> close(String connectionId) async {
     var req = $wp.WebsocketCloseConnectionRequest(
         socketName: name, connectionId: connectionId);
     await _websocketClient.closeConnection(req);

lib/src/workers/common.dart

@@ -3,7 +3,6 @@ import 'dart:async';
 import 'package:grpc/grpc.dart';
 
 import 'package:nitric_sdk/nitric.dart';
-import 'package:nitric_sdk/resources.dart';
 import 'package:nitric_sdk/src/api/api.dart';
 import 'package:nitric_sdk/src/grpc_helper.dart';
 

test/src/resources/api_test.dart

@@ -2,7 +2,6 @@ import 'package:mocktail/mocktail.dart';
 import 'package:nitric_sdk/nitric.dart';
 import 'package:nitric_sdk/src/nitric/proto/apis/v1/apis.pbgrpc.dart' as $p;
 import 'package:nitric_sdk/src/nitric/proto/resources/v1/resources.pb.dart';
-import 'package:nitric_sdk/src/resources/common.dart';
 import 'package:test/test.dart';
 
 import '../common.dart';

test/src/resources/bucket_test.dart

@@ -1,11 +1,9 @@
 import 'package:mocktail/mocktail.dart';
 import 'package:nitric_sdk/nitric.dart';
-import 'package:nitric_sdk/resources.dart';
 import 'package:nitric_sdk/src/nitric/proto/resources/v1/resources.pb.dart'
     as $p;
 import 'package:nitric_sdk/src/nitric/proto/storage/v1/storage.pbgrpc.dart'
     as $sp;
-import 'package:nitric_sdk/src/resources/common.dart';
 import 'package:test/test.dart';
 
 import '../common.dart';

test/src/resources/websocket_test.dart

@@ -71,7 +71,7 @@ void main() {
     var websocket = Websocket("socketName",
         client: resourceClient, websocketClient: websocketClient);
 
-    await websocket.sendMessage("connectionId", "hello world");
+    await websocket.send("connectionId", "hello world");
 
     verify(() => websocketClient.sendMessage(req)).called(1);
   });
@@ -90,7 +90,7 @@ void main() {
     var websocket = Websocket("socketName",
         client: resourceClient, websocketClient: websocketClient);
 
-    await websocket.closeConnection("connectionId");
+    await websocket.close("connectionId");
 
     verify(() => websocketClient.closeConnection(req)).called(1);
   });