@superblocksteam/sdk 2.0.0-next.38 → 2.0.0-next.39

package/dist/socket/index.d.ts

@@ -1,6 +1,4 @@
-import { ISocket } from "@superblocksteam/shared";
-import WebSocket from "ws";
-import type { GenericMiddleware, ISocketClient, MethodHandlers, RequestContextBase, SocketTimeouts } from "../types/index.js";
+import type { ISocketClient } from "../types/index.js";
 import type { ServerMethods } from "@superblocksteam/shared";
 export type StdISocketRPCClient = ISocketClient<ServerMethods>;
 export declare function connectToISocketRPCServer({ superblocksBaseUrl, agentUrl, token, }: {
@@ -8,12 +6,4 @@ export declare function connectToISocketRPCServer({ superblocksBaseUrl, agentUrl
     token: string;
     agentUrl?: string;
 }): Promise<StdISocketRPCClient>;
-export declare class ISocketWithClientAuth<ImplementedMethods, CallableMethods, RequestContext extends RequestContextBase> extends ISocket<ImplementedMethods, CallableMethods, RequestContext> {
-    private readonly authorization?;
-    private hasSentAuth;
-    constructor(ws: WebSocket, authorization: string | undefined, requestHandlers: MethodHandlers<ImplementedMethods, CallableMethods, RequestContext>, globalMiddlewares: GenericMiddleware<CallableMethods, RequestContext>[], timeouts?: SocketTimeouts);
-    request<Params, Result>(method: string, params: Params): Promise<Result>;
-}
-export declare function connectISocket<CallableMethods, ImplementedMethods, RequestContext extends RequestContextBase = RequestContextBase>(wsUrl: string, authorization: string | undefined, requestHandlers: MethodHandlers<ImplementedMethods, CallableMethods, RequestContext>, globalMiddlewares: GenericMiddleware<CallableMethods, RequestContext>[], timeouts?: SocketTimeouts): Promise<ISocketClient<CallableMethods>>;
-export declare function connectWebSocket(wsUrl: string): Promise<WebSocket>;
 //# sourceMappingURL=index.d.ts.map

package/dist/socket/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/socket/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,OAAO,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,SAAS,MAAM,IAAI,CAAC;AAE3B,OAAO,KAAK,EACV,iBAAiB,EACjB,aAAa,EACb,cAAc,EACd,kBAAkB,EAClB,cAAc,EACf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAiB,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE5E,MAAM,MAAM,mBAAmB,GAAG,aAAa,CAAC,aAAa,CAAC,CAAC;AAE/D,wBAAsB,yBAAyB,CAAC,EAC9C,kBAAkB,EAClB,QAAQ,EACR,KAAK,GACN,EAAE;IACD,kBAAkB,EAAE,MAAM,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CA6B/B;AAKD,qBAAa,qBAAqB,CAChC,kBAAkB,EAClB,eAAe,EACf,cAAc,SAAS,kBAAkB,CACzC,SAAQ,OAAO,CAAC,kBAAkB,EAAE,eAAe,EAAE,cAAc,CAAC;IACpE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAS;IACxC,OAAO,CAAC,WAAW,CAAS;gBAG1B,EAAE,EAAE,SAAS,EACb,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,eAAe,EAAE,cAAc,CAC7B,kBAAkB,EAClB,eAAe,EACf,cAAc,CACf,EACD,iBAAiB,EAAE,iBAAiB,CAAC,eAAe,EAAE,cAAc,CAAC,EAAE,EACvE,QAAQ,CAAC,EAAE,cAAc;IAOrB,OAAO,CAAC,MAAM,EAAE,MAAM,EAC1B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC;CAWnB;AAED,wBAAsB,cAAc,CAClC,eAAe,EACf,kBAAkB,EAClB,cAAc,SAAS,kBAAkB,GAAG,kBAAkB,EAE9D,KAAK,EAAE,MAAM,EACb,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,eAAe,EAAE,cAAc,CAC7B,kBAAkB,EAClB,eAAe,EACf,cAAc,CACf,EACD,iBAAiB,EAAE,iBAAiB,CAAC,eAAe,EAAE,cAAc,CAAC,EAAE,EACvE,QAAQ,CAAC,EAAE,cAAc,GACxB,OAAO,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC,CAUzC;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAgBlE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/socket/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAiB,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE5E,MAAM,MAAM,mBAAmB,GAAG,aAAa,CAAC,aAAa,CAAC,CAAC;AAE/D,wBAAsB,yBAAyB,CAAC,EAC9C,kBAAkB,EAClB,QAAQ,EACR,KAAK,GACN,EAAE;IACD,kBAAkB,EAAE,MAAM,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CA8B/B"}

package/dist/socket/index.js

@@ -1,5 +1,5 @@
-import { createISocketClient, ISocket } from "@superblocksteam/shared";
-import WebSocket from "ws";
+import { connectISocket } from "@superblocksteam/shared";
+import tracer from "../dev-utils/dev-tracer.js";
 import { createRequestHandlers } from "./handlers.js";
 export async function connectToISocketRPCServer({ superblocksBaseUrl, agentUrl, token, }) {
     const requestHandlers = createRequestHandlers({
@@ -20,48 +20,9 @@ export async function connectToISocketRPCServer({ superblocksBaseUrl, agentUrl,
     else if (wsUrl.hostname === "localhost") {
         wsUrl.hostname = "127.0.0.1";
     }
-    return await connectISocket(wsUrl.href, authorization, requestHandlers, [], {
+    return await connectISocket(wsUrl.href, authorization, requestHandlers, [], tracer, {
         connectionTimeoutInSeconds: 6 * 60, // 6 minutes
         noResponseTimeoutInSeconds: 5 * 60, // 5 minutes
     });
 }
-// a subclass of ISocket that sends an auth token on the first request
-// this is useful for client-side sockets that need to authenticate
-// TODO(george): if we start using this for long-lived connections, we should add a way to refresh the token
-export class ISocketWithClientAuth extends ISocket {
-    authorization;
-    hasSentAuth = false;
-    constructor(ws, authorization, requestHandlers, globalMiddlewares, timeouts) {
-        super(ws, requestHandlers, globalMiddlewares, timeouts);
-        this.authorization = authorization;
-    }
-    // override `request` from the base class to send `authorization` when appropriate
-    async request(method, params) {
-        // only send `authorization` on the first request
-        const authorization = this.hasSentAuth ? undefined : this.authorization;
-        const result = await super.request(method, params, authorization);
-        this.hasSentAuth = true;
-        return result;
-    }
-}
-export async function connectISocket(wsUrl, authorization, requestHandlers, globalMiddlewares, timeouts) {
-    const ws = await connectWebSocket(wsUrl);
-    const isocket = new ISocketWithClientAuth(ws, authorization, requestHandlers, globalMiddlewares, timeouts);
-    return createISocketClient(isocket);
-}
-export function connectWebSocket(wsUrl) {
-    return new Promise((resolve, reject) => {
-        const ws = new WebSocket(wsUrl);
-        ws.addEventListener("open", () => {
-            // Resolve the promise with the WebSocket instance when the connection is open
-            resolve(ws);
-        });
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        ws.addEventListener("error", (error) => {
-            // Reject the promise if there's an error
-            reject(error);
-        });
-    });
-}
 //# sourceMappingURL=index.js.map

package/dist/socket/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/socket/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/socket/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,MAAM,MAAM,4BAA4B,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAMtD,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,EAC9C,kBAAkB,EAClB,QAAQ,EACR,KAAK,GAKN;IACC,MAAM,eAAe,GAAG,qBAAqB,CAAC;QAC5C,QAAQ;QACR,KAAK;KACN,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,UAAU,KAAK,EAAE,CAAC;IACxC,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC;IAC3D,IAAI,KAAK,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QAC/B,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC;IACzB,CAAC;SAAM,IAAI,KAAK,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACvC,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC;IAC1B,CAAC;IAED,IAAI,KAAK,CAAC,IAAI,KAAK,gBAAgB,IAAI,KAAK,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;QACvE,KAAK,CAAC,IAAI,GAAG,gBAAgB,CAAC;IAChC,CAAC;SAAM,IAAI,KAAK,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;QAC1C,KAAK,CAAC,QAAQ,GAAG,WAAW,CAAC;IAC/B,CAAC;IAED,OAAO,MAAM,cAAc,CACzB,KAAK,CAAC,IAAI,EACV,aAAa,EACb,eAAe,EACf,EAAE,EACF,MAAM,EACN;QACE,0BAA0B,EAAE,CAAC,GAAG,EAAE,EAAE,YAAY;QAChD,0BAA0B,EAAE,CAAC,GAAG,EAAE,EAAE,YAAY;KACjD,CACF,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/sdk",
-  "version": "2.0.0-next.38",
+  "version": "2.0.0-next.39",
   "type": "module",
   "description": "Superblocks JS SDK",
   "homepage": "https://www.superblocks.com",
@@ -26,9 +26,9 @@
     "@opentelemetry/semantic-conventions": "^1.28.0",
     "@rollup/wasm-node": "^4.35.0",
     "@superblocksteam/bucketeer-sdk": "0.4.1",
-    "@superblocksteam/shared": "0.9132.0",
-    "@superblocksteam/util": "2.0.0-next.38",
-    "@superblocksteam/vite-plugin-file-sync": "2.0.0-next.38",
+    "@superblocksteam/shared": "0.9137.0",
+    "@superblocksteam/util": "2.0.0-next.39",
+    "@superblocksteam/vite-plugin-file-sync": "2.0.0-next.39",
     "@vitejs/plugin-react": "^4.3.4",
     "axios": "^1.4.0",
     "chokidar": "^4.0.3",

package/src/socket/index.ts

@@ -1,13 +1,7 @@
-import { createISocketClient, ISocket } from "@superblocksteam/shared";
-import WebSocket from "ws";
+import { connectISocket } from "@superblocksteam/shared";
+import tracer from "../dev-utils/dev-tracer.js";
 import { createRequestHandlers } from "./handlers.js";
-import type {
-  GenericMiddleware,
-  ISocketClient,
-  MethodHandlers,
-  RequestContextBase,
-  SocketTimeouts,
-} from "../types/index.js";
+import type { ISocketClient } from "../types/index.js";
 import type { ClientMethods, ServerMethods } from "@superblocksteam/shared";
 
 export type StdISocketRPCClient = ISocketClient<ServerMethods>;
@@ -44,96 +38,10 @@ export async function connectToISocketRPCServer({
     authorization,
     requestHandlers,
     [],
+    tracer,
     {
       connectionTimeoutInSeconds: 6 * 60, // 6 minutes
       noResponseTimeoutInSeconds: 5 * 60, // 5 minutes
     },
   );
 }
-
-// a subclass of ISocket that sends an auth token on the first request
-// this is useful for client-side sockets that need to authenticate
-// TODO(george): if we start using this for long-lived connections, we should add a way to refresh the token
-export class ISocketWithClientAuth<
-  ImplementedMethods,
-  CallableMethods,
-  RequestContext extends RequestContextBase,
-> extends ISocket<ImplementedMethods, CallableMethods, RequestContext> {
-  private readonly authorization?: string;
-  private hasSentAuth = false;
-
-  constructor(
-    ws: WebSocket,
-    authorization: string | undefined,
-    requestHandlers: MethodHandlers<
-      ImplementedMethods,
-      CallableMethods,
-      RequestContext
-    >,
-    globalMiddlewares: GenericMiddleware<CallableMethods, RequestContext>[],
-    timeouts?: SocketTimeouts,
-  ) {
-    super(ws, requestHandlers, globalMiddlewares, timeouts);
-    this.authorization = authorization;
-  }
-
-  // override `request` from the base class to send `authorization` when appropriate
-  async request<Params, Result>(
-    method: string,
-    params: Params,
-  ): Promise<Result> {
-    // only send `authorization` on the first request
-    const authorization = this.hasSentAuth ? undefined : this.authorization;
-    const result = await super.request<Params, Result>(
-      method,
-      params,
-      authorization,
-    );
-    this.hasSentAuth = true;
-    return result;
-  }
-}
-
-export async function connectISocket<
-  CallableMethods,
-  ImplementedMethods,
-  RequestContext extends RequestContextBase = RequestContextBase,
->(
-  wsUrl: string,
-  authorization: string | undefined,
-  requestHandlers: MethodHandlers<
-    ImplementedMethods,
-    CallableMethods,
-    RequestContext
-  >,
-  globalMiddlewares: GenericMiddleware<CallableMethods, RequestContext>[],
-  timeouts?: SocketTimeouts,
-): Promise<ISocketClient<CallableMethods>> {
-  const ws = await connectWebSocket(wsUrl);
-  const isocket = new ISocketWithClientAuth(
-    ws,
-    authorization,
-    requestHandlers,
-    globalMiddlewares,
-    timeouts,
-  );
-  return createISocketClient(isocket);
-}
-
-export function connectWebSocket(wsUrl: string): Promise<WebSocket> {
-  return new Promise((resolve, reject) => {
-    const ws = new WebSocket(wsUrl);
-
-    ws.addEventListener("open", () => {
-      // Resolve the promise with the WebSocket instance when the connection is open
-      resolve(ws);
-    });
-
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    ws.addEventListener("error", (error: Error) => {
-      // Reject the promise if there's an error
-      reject(error);
-    });
-  });
-}