@hautechai/sdk 0.2.1 → 0.2.3

package/dist/sdk/index.d.ts

@@ -202,7 +202,7 @@ export declare const createSDK: (options: SDKOptions) => {
         }) => Promise<void>;
         wait: <T extends import("../types").OperationEntity | {
             id: string;
-        }, N extends number | undefined>(props: T, timeoutMs?: N) => Promise<((T extends import("../types").OperationEntity ? T : import("../types").OperationEntity) & ({
+        }, N extends number | undefined = undefined>(props: T, timeoutMs?: N) => Promise<((T extends import("../types").OperationEntity ? T : import("../types").OperationEntity) & ({
             status: "failed";
             output: null;
         } | {

package/dist/sdk/listeners/index.d.ts

@@ -1,11 +1,12 @@
 import { OperationEntity, OperationsApi } from '../../autogenerated';
-import { WebSocket } from 'ws';
+import { client as WebSocketClient, connection as Connection } from 'websocket';
 export declare class OperationsListener {
     useWebsocket: {
         endpoint: string;
         token: () => string | Promise<string>;
     } | null;
-    ws: WebSocket | null;
+    ws: WebSocketClient | null;
+    connection: Connection | null;
     operations: () => Promise<OperationsApi>;
     constructor({ ws, operations, }: {
         ws: {
@@ -20,6 +21,6 @@ export declare class OperationsListener {
     subscribe(): Promise<void>;
     onOpen(): void;
     onMessage(msg: string): void;
-    onClose(number: number, reason: Buffer): void;
+    onClose(number: number, reason: string): void;
     close(): void;
 }

package/dist/sdk/listeners/index.js

@@ -1,10 +1,11 @@
-import { WebSocket } from 'ws';
+import { client as WebSocketClient } from 'websocket';
 import { HautechException } from '../exceptions';
 // This is pretty much a dirty solution until we need to rework this part.
 export class OperationsListener {
     constructor({ ws, operations, }) {
         this.useWebsocket = null;
         this.ws = null;
+        this.connection = null;
         this.operationsStore = {};
         if (ws) {
             this.useWebsocket = {
@@ -15,7 +16,7 @@ export class OperationsListener {
         this.operations = operations;
     }
     async getOperation(id) {
-        const isWsReady = this.ws?.readyState == WebSocket.OPEN;
+        const isWsReady = this.connection?.connected;
         if (!this.operationsStore[id] || !isWsReady) {
             const api = await this.operations();
             const operation = await api.operationsControllerGetOperationV1(id);
@@ -34,19 +35,28 @@ export class OperationsListener {
         if (!this.useWebsocket)
             return;
         try {
-            this.ws = new WebSocket(this.useWebsocket.endpoint, ['1', await this.useWebsocket.token()]);
-            this.ws.on('open', () => this.onOpen());
-            this.ws.on('message', (msg) => this.onMessage(msg));
-            this.ws.on('close', (number, reason) => this.onClose(number, reason));
+            this.ws = new WebSocketClient();
+            this.ws.connect(this.useWebsocket.endpoint, ['1', await this.useWebsocket.token()]);
+            this.ws.on('connect', (connection) => {
+                this.connection = connection;
+                this.onOpen();
+                connection.on('message', (msg) => {
+                    if (msg.type === 'utf8')
+                        this.onMessage(msg.utf8Data);
+                    else if (msg.type === 'binary')
+                        this.onMessage(msg.binaryData.toString('utf8'));
+                });
+                connection.on('close', (number, reason) => this.onClose(number, reason));
+            });
         }
         catch (err) {
             throw new HautechException(`SDK failed to open websocket: ${err}`);
         }
     }
     onOpen() {
-        if (!this.ws)
+        if (!this.connection)
             throw new HautechException('Semantics error: this is a bug.');
-        this.ws.send(JSON.stringify({
+        this.connection.send(JSON.stringify({
             event: 'subscribe',
             data: {
                 channel: 'own_resources',
@@ -54,7 +64,7 @@ export class OperationsListener {
         }));
     }
     onMessage(msg) {
-        if (!this.ws)
+        if (!this.connection)
             throw new HautechException('Semantics error: this is a bug.');
         const { event, data } = JSON.parse(msg);
         switch (event) {
@@ -67,15 +77,14 @@ export class OperationsListener {
         }
     }
     onClose(number, reason) {
-        if (!this.ws)
+        if (!this.connection)
             throw new HautechException('Semantics error: this is a bug.');
         // Reset dirty state.
         this.operationsStore = {};
         this.ws = null;
     }
     close() {
-        if (!this.ws)
-            return;
-        this.ws.close();
+        this.ws?.abort();
+        this.connection?.close();
     }
 }

package/dist/sdk/operations/index.d.ts

@@ -121,6 +121,6 @@ declare const operations: (options: SDKOptions, relevantOperations: OperationsLi
     }) => Promise<void>;
     wait: <T extends OperationEntity | {
         id: string;
-    }, N extends number | undefined>(props: T, timeoutMs?: N) => Promise<Waited<T extends OperationEntity ? T : OperationEntity> | (N extends undefined ? never : null)>;
+    }, N extends number | undefined = undefined>(props: T, timeoutMs?: N) => Promise<Waited<T extends OperationEntity ? T : OperationEntity> | (N extends undefined ? never : null)>;
 };
 export default operations;

package/dist/sdk/pipelines/index.js

@@ -55,23 +55,23 @@ const pipelines = (options) => {
             run: {
                 haute: {
                     linda: {
-                        v1: callMethod((methods) => methods.callControllerCallOperationsRunHauteLindaV1V1)
+                        v1: callMethod((methods) => methods.callControllerCallOperationsRunHauteLindaV1V1),
                     },
                     naomi: {
-                        v1: callMethod((methods) => methods.callControllerCallOperationsRunHauteNaomiV1V1)
+                        v1: callMethod((methods) => methods.callControllerCallOperationsRunHauteNaomiV1V1),
                     },
                 },
                 inpaint: {
                     kate: {
                         v1: callMethod((methods) => methods.callControllerCallOperationsRunInpaintKateV1V1),
-                    }
+                    },
                 },
                 gpt: {
-                    v1: callMethod((methods) => methods.callControllerCallOperationsRunGptV1V1)
+                    v1: callMethod((methods) => methods.callControllerCallOperationsRunGptV1V1),
                 },
                 imagine: {
                     kate: {
-                        v1: callMethod((methods) => methods.callControllerCallOperationsRunImagineKateV1V1)
+                        v1: callMethod((methods) => methods.callControllerCallOperationsRunImagineKateV1V1),
                     },
                 },
                 upscale: {
@@ -86,7 +86,7 @@ const pipelines = (options) => {
                     },
                     mask: {
                         v1: callMethod((methods) => methods.callControllerCallOperationsRunSegmentAnythingMaskV1V1),
-                    }
+                    },
                 },
                 poseEstimation: {
                     v1: callMethod((methods) => methods.callControllerCallOperationsRunPoseEstimationV1V1),
@@ -100,7 +100,7 @@ const pipelines = (options) => {
                 vton: {
                     gisele: {
                         v1: callMethod((methods) => methods.callControllerCallOperationsRunVtonGiseleV1V1),
-                    }
+                    },
                 },
                 negateImage: {
                     v1: callMethod((methods) => methods.callControllerCallOperationsRunNegateImageV1V1),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hautechai/sdk",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "license": "MIT",
   "keywords": [],
   "repository": {
@@ -13,7 +13,7 @@
     "@hautechai/pipelines": "0.3.2",
     "axios": "1.6.1",
     "jose": "5.9.6",
-    "ws": "^8.18.0"
+    "websocket": "^1.0.35"
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
@@ -21,10 +21,12 @@
     "@types/jest": "29.5.12",
     "@types/jsonwebtoken": "9.0.7",
     "@types/node": "22.5.2",
+    "@types/websocket": "^1.0.10",
     "@types/ws": "^8.5.14",
     "dotenv": "16.4.7",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
+    "prettier": "^3.5.1",
     "ts-jest": "29.2.5",
     "ts-node": "10.9.2",
     "tslib": "2.7.0",