fix: resolve comments

api/client.ts

@@ -20,7 +20,11 @@ import {
   Error as MacaroonError,
   MacaroonObject,
 } from "@canonical/macaroon-bakery/dist/macaroon";
-import type { Callback, JujuRequest } from "../generator/interfaces";
+import type {
+  Callback,
+  CloseCallback,
+  JujuRequest,
+} from "../generator/interfaces";
 import {
   ClassType,
   Facade,
@@ -34,7 +38,7 @@ export const CLIENT_VERSION = "3.3.2";
 
 export interface ConnectOptions {
   bakery?: Bakery | null;
-  closeCallback: Callback<number>;
+  closeCallback: CloseCallback;
   debug?: boolean;
   facades?: (ClassType<Facade> | GenericFacade)[];
   onWSCreated?: (ws: WebSocket) => void;
@@ -368,7 +372,7 @@ class Client {
       another callback. It is responsibility of the callback to call the
       provided callback if present.
   */
-  logout(callback?: Callback<Client>) {
+  logout(callback?: (code: number, callback: CloseCallback) => void) {
     this._transport.close(callback);
   }
 
@@ -414,10 +418,10 @@ export class Transport {
   _ws: WebSocket;
   _counter: number;
   _callbacks: { [k: number]: Callback<any> };
-  _closeCallback: Callback<number>;
+  _closeCallback: CloseCallback;
   _debug: boolean;
 
-  constructor(ws: WebSocket, closeCallback: Callback<number>, debug: boolean) {
+  constructor(ws: WebSocket, closeCallback: CloseCallback, debug: boolean) {
     this._ws = ws;
     this._counter = 0;
     this._callbacks = {};
@@ -433,7 +437,7 @@ export class Transport {
       if (this._debug) {
         console.debug("close:", evt.code, evt.reason);
       }
-      this._closeCallback(toError(evt.code.toString()));
+      this._closeCallback(evt.code);
     };
   }
 
@@ -447,7 +451,11 @@ export class Transport {
     @param resolve Function called when the request is successful.
     @param reject Function called when the request is not successful.
   */
-  write(req: JujuRequest, resolve: Function, reject: (error: any) => void) {
+  write(
+    req: JujuRequest,
+    resolve: (value: any) => void,
+    reject: (error: Error) => void
+  ) {
     // Check that the connection is ready and sane.
     const state = this._ws.readyState;
     if (state !== 1) {
@@ -477,7 +485,7 @@ export class Transport {
       callback receives the close code and optionally another callback. It is
       responsibility of the callback to call the provided callback if present.
   */
-  close(callback?: Callback<any>) {
+  close(callback?: (code: number, callback: CloseCallback) => void) {
     const closeCallback = this._closeCallback;
     this._closeCallback = (code) => {
       if (callback) {

api/helpers.ts

@@ -272,9 +272,6 @@ function wrapClient(cls: any) {
       method which can be provided a callback receiving an error.
   */
   cls.prototype.watch = function (callback: Callback<any>): object | undefined {
-    if (!callback) {
-      callback = (_error: CallbackError, _result?: any) => {};
-    }
     // Check that the AllWatcher facade is loaded, as we will use it.
     const allWatcher = this._info.getFacade("allWatcher");
     if (!allWatcher) {
@@ -341,9 +338,6 @@ function wrapController(cls: any) {
       method which can be provided a callback receiving an error.
   */
   cls.prototype.watch = function (callback: Callback<any>): object | undefined {
-    if (!callback) {
-      callback = (_error: CallbackError, _result?: any) => {};
-    }
     // Check that the AllModelWatcher facade is loaded, as we will use it.
     const allModelWatcher: any = this._info.getFacade("allModelWatcher");
     if (!allModelWatcher) {

api/tests/test-client.ts

@@ -162,7 +162,6 @@ describe("connect", () => {
 
   it("login redirection error failure via promise", (done) => {
     connect("wss://1.2.3.4", options).then((juju: Client) => {
-      // juju._admin.redirectInfo = jest.fn().mockImplementation(() => null);
       juju
         ?.login({})
         .then(() => fail)
@@ -206,7 +205,6 @@ describe("connect", () => {
 
   it("login generic redirection error failure via promise", (done) => {
     connect("wss://1.2.3.4", options).then((juju: Client) => {
-      // juju._admin.redirectInfo = jest.fn().mockImplementation(() => null);
       juju
         ?.login({})
         .then(() => fail)

api/utils.ts

@@ -38,19 +38,17 @@ export function autoBind(obj: { [k: string]: any }): void {
 export function createAsyncHandler<T>(
   callback: Callback<T> | undefined,
   resolve: (value: T) => void,
-  reject: (value: CallbackError) => void,
+  reject: (error: CallbackError) => void,
   transform?: (value: T) => T
-): { resolve: Function; reject: Function } {
+): { resolve: (value: T) => void; reject: (error: CallbackError) => void } {
   return {
     resolve: (value: T) => {
       if (transform) {
         value = transform(value!);
       }
       callback ? callback(null, value) : resolve(value!);
     },
-    reject: (error: CallbackError) => {
-      callback ? callback(error) : reject(error);
-    },
+    reject: callback ? callback : reject,
   };
 }
 

generator/interfaces.ts

@@ -57,3 +57,4 @@ export interface JujuRequest {
 
 export type CallbackError = Error | null;
 export type Callback<T> = (error: CallbackError, value?: T) => void;
+export type CloseCallback = (code: number) => void;