@push-rpc/next 2.0.10 → 2.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@push-rpc/next",
-  "version": "2.0.10",
+  "version": "2.0.12",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {

package/src/client/HttpClient.ts

@@ -1,14 +1,11 @@
 import {CLIENT_ID_HEADER, RpcErrors} from "../rpc.js"
 import {safeParseJson, safeStringify} from "../utils/json.js"
-import {ClientCookies} from "../utils/cookies.js"
-import {environment, Environment} from "../utils/env.js"
 
 export class HttpClient {
   constructor(
     private url: string,
     private clientId: string,
-    private getHeaders: () => Promise<Record<string, string>>,
-    private cookies: ClientCookies
+    private getHeaders: () => Promise<Record<string, string>>
   ) {}
 
   async call(itemName: string, params: unknown[], callTimeout: number): Promise<unknown> {
@@ -39,14 +36,6 @@ export class HttpClient {
     try {
       const {signal, finished} = timeoutSignal(callTimeout)
 
-      if (environment != Environment.Browser) {
-        const cookie = this.cookies.getCookieString()
-
-        if (cookie) {
-          headers["Cookie"] = cookie
-        }
-      }
-
       const response = await fetch(itemUrl, {
         method,
         headers: {
@@ -60,14 +49,6 @@ export class HttpClient {
 
       finished()
 
-      if (environment != Environment.Browser) {
-        const cookie = response.headers.get("set-cookie")
-
-        if (cookie) {
-          this.cookies.updateCookies(cookie.split(","))
-        }
-      }
-
       if (response.status == 204) {
         return
       }

package/src/client/RpcClientImpl.ts

@@ -5,21 +5,19 @@ import {WebSocketConnection} from "./WebSocketConnection.js"
 import {nanoid} from "nanoid"
 import {createRemote, ServicesWithSubscriptions} from "./remote.js"
 import {ConsumeServicesOptions, RpcClient} from "./index.js"
-import {withMiddlewares} from "../utils/middleware.js"
-import {ClientCookies} from "../utils/cookies.js"
+import {Middleware, withMiddlewares} from "../utils/middleware.js"
 
 export class RpcClientImpl<S extends Services<S>> implements RpcClient {
   constructor(
     url: string,
     private readonly options: ConsumeServicesOptions
   ) {
-    this.httpClient = new HttpClient(url, this.clientId, options.getHeaders, this.cookies)
+    this.httpClient = new HttpClient(url, this.clientId, options.getHeaders)
     this.remoteSubscriptions = new RemoteSubscriptions()
 
     this.connection = new WebSocketConnection(
       options.getSubscriptionsUrl(url),
       this.clientId,
-      this.cookies,
       {
         subscriptions: options.subscriptions,
         errorDelayMaxDuration: options.errorDelayMaxDuration,
@@ -27,7 +25,22 @@ export class RpcClientImpl<S extends Services<S>> implements RpcClient {
         pingInterval: options.pingInterval,
       },
       (itemName, parameters, data) => {
-        this.remoteSubscriptions.consume(itemName, parameters, data)
+        const ctx: RpcContext = {
+          clientId: this.clientId,
+          itemName,
+          invocationType: InvocationType.Update,
+        }
+
+        const next = async (nextData = data, nextParameters = parameters) =>
+          this.remoteSubscriptions.consume(itemName, nextParameters, nextData)
+
+        return withMiddlewares(
+          ctx,
+          this.options.notificationsMiddleware,
+          next as any,
+          data,
+          parameters
+        )
       },
       () => {
         this.resubscribe()
@@ -43,7 +56,6 @@ export class RpcClientImpl<S extends Services<S>> implements RpcClient {
   private readonly httpClient: HttpClient
   private readonly remoteSubscriptions: RemoteSubscriptions
   private readonly connection: WebSocketConnection
-  private readonly cookies: ClientCookies = new ClientCookies()
 
   isConnected() {
     return this.connection.isConnected()

package/src/client/WebSocketConnection.ts

@@ -1,22 +1,22 @@
 import {log} from "../logger.js"
 import {safeParseJson} from "../utils/json.js"
 import {adelay} from "../utils/promises.js"
-import {environment, Environment} from "../utils/env.js"
-import {ClientCookies} from "../utils/cookies.js"
-import type {IncomingMessage} from "http"
 
 export class WebSocketConnection {
   constructor(
     private readonly url: string,
     private readonly clientId: string,
-    private readonly cookies: ClientCookies,
     private readonly options: {
       subscriptions: boolean
       reconnectDelay: number
       errorDelayMaxDuration: number
       pingInterval: number | null
     },
-    private readonly consume: (itemName: string, parameters: unknown[], data: unknown) => void,
+    private readonly consume: (
+      itemName: string,
+      parameters: unknown[],
+      data: unknown
+    ) => Promise<unknown>,
     private readonly onConnected: () => void,
     private readonly onDisconnected: () => void
   ) {
@@ -122,26 +122,7 @@ export class WebSocketConnection {
   private async establishConnection(onDisconnected: () => void): Promise<void> {
     return new Promise(async (resolve, reject) => {
       try {
-        let socket: WebSocket
-
-        if ([Environment.ReactNative, Environment.Node].includes(environment)) {
-          // use RN WS or node-ws headers extensions to set cookie
-          let options = undefined
-
-          const cookie = this.cookies.getCookieString()
-          if (cookie) {
-            options = {
-              headers: {
-                Cookie: cookie,
-              },
-            }
-          }
-
-          socket = new (WebSocket as any)(this.url, this.clientId, options)
-        } else {
-          // rely on browser cookie handling
-          socket = new WebSocket(this.url, this.clientId)
-        }
+        const socket = new WebSocket(this.url, this.clientId)
 
         let connected = false
 
@@ -217,9 +198,9 @@ export class WebSocketConnection {
 
       const [itemName, data, ...parameters] = safeParseJson(msg)
 
-      this.consume(itemName, parameters, data)
+      await this.consume(itemName, parameters, data)
     } catch (e) {
-      log.warn("Invalid message received", e)
+      log.error("Can't handle notification", e)
     }
   }
 

package/src/client/index.ts

@@ -22,6 +22,7 @@ export type ConsumeServicesOptions = {
   pingInterval: number | null
   subscriptions: boolean
   middleware: Middleware<RpcContext>[]
+  notificationsMiddleware: Middleware<RpcContext>[]
   connectOnCreate: boolean
   onConnected: () => void
   onDisconnected: () => void
@@ -64,6 +65,7 @@ const defaultOptions: ConsumeServicesOptions = {
   pingInterval: null, // if set, should be in-sync with server, ie 30 * 1000
   subscriptions: true,
   middleware: [],
+  notificationsMiddleware: [],
   connectOnCreate: false,
   onConnected: () => {},
   onDisconnected: () => {},

package/src/index.ts

@@ -5,6 +5,7 @@ export type {Middleware} from "./utils/middleware.js"
 export {withMiddlewares} from "./utils/middleware.js"
 
 export type {RpcServer, PublishServicesOptions} from "./server/index.js"
+export type {HttpServerHooks} from "./server/http.js"
 export {publishServices} from "./server/index.js"
 
 export type {ServicesWithTriggers} from "./server/local.js"

package/src/rpc.ts

@@ -47,5 +47,6 @@ export enum InvocationType {
   Call = "Call",
   Subscribe = "Subscribe",
   Unsubscribe = "Unsubscribe", // client only
+  Update = "Update", // client only
   Trigger = "Trigger", // server only
 }

package/src/server/RpcServerImpl.ts

@@ -38,19 +38,23 @@ export class RpcServerImpl<S extends Services<S>, C extends RpcContext> implemen
       })
     }
 
-    this.httpServer.addListener("request", (req, res) =>
+    this.httpServer.addListener("request", (req, res) => {
+      const hooks = {
+        call: this.call,
+        subscribe: this.subscribe,
+        unsubscribe: this.unsubscribe,
+      }
+
       serveHttpRequest(
         req,
         res,
         options.path,
-        {
-          call: this.call,
-          subscribe: this.subscribe,
-          unsubscribe: this.unsubscribe,
-        },
+        options.createServerHooks ? options.createServerHooks(hooks, req) : hooks,
         options.createConnectionContext
-      )
-    )
+      ).catch((e) => {
+        log.warn("Unhandled error serving HTTP request", e)
+      })
+    })
   }
 
   private async createConnectionsServer() {

package/src/server/index.ts

@@ -3,6 +3,7 @@ import {ServicesWithTriggers} from "./local.js"
 import {Middleware} from "../utils/middleware.js"
 import {RpcServerImpl} from "./RpcServerImpl.js"
 import http, {IncomingMessage} from "http"
+import {HttpServerHooks} from "./http"
 
 export async function publishServices<S extends Services<S>, C extends RpcContext>(
   services: S,
@@ -41,6 +42,7 @@ export type PublishServicesOptions<C extends RpcContext> = {
   pingInterval: number
   subscriptions: boolean
   createConnectionContext(req: IncomingMessage): Promise<RpcConnectionContext>
+  createServerHooks?(hooks: HttpServerHooks, req: IncomingMessage): HttpServerHooks
 } & (
   | {
       server: http.Server

package/src/utils/middleware.ts

@@ -25,11 +25,16 @@ export function withMiddlewares<Context>(
       index = i
 
       try {
+        let result
+
         if (i === middlewares.length) {
-          return Promise.resolve(next(...p))
+          result = next(...p)
         } else {
-          return Promise.resolve(middlewares[i](ctx, dispatch.bind(null, i + 1), ...p))
+          const dispatchNextMiddleware = dispatch.bind(null, i + 1)
+          result = middlewares[i](ctx, dispatchNextMiddleware, ...p)
         }
+
+        return Promise.resolve(result)
       } catch (err) {
         return Promise.reject(err)
       }

package/tests/connection.ts

@@ -1,9 +1,7 @@
 import {assert} from "chai"
-import {createTestClient, startTestServer, TEST_PORT, testClient, testServer} from "./testUtils.js"
-import WebSocket, {WebSocketServer} from "ws"
+import {createTestClient, startTestServer, testClient, testServer} from "./testUtils.js"
+import WebSocket from "ws"
 import {adelay} from "../src/utils/promises.js"
-import http, {IncomingMessage} from "http"
-import {parseCookies} from "../src/utils/cookies.js"
 
 describe("connection", () => {
   it("server close connection on ping timeout", async () => {
@@ -134,87 +132,4 @@ describe("connection", () => {
 
     assert.equal(disconnected, true)
   })
-
-  describe("cookies", () => {
-    it("handle cookies in subseq requests", async () => {
-      let call = 0
-
-      let sentClientCookies: Record<string, string> = {}
-
-      const httpServer = http.createServer((req, res) => {
-        const headers: Record<string, string> = {"Content-Type": "text/plain"}
-
-        if (!call++) {
-          headers["Set-Cookie"] = `name=value; path=/; secure; samesite=none; httponly`
-        } else {
-          sentClientCookies = parseCookies(req.headers.cookie || "")
-        }
-
-        res.writeHead(200, headers)
-
-        res.end("ok")
-      })
-
-      let resolveStarted = () => {}
-      const started = new Promise<void>((r) => (resolveStarted = r))
-      httpServer.listen(TEST_PORT, () => resolveStarted())
-      await started
-
-      const client = await createTestClient<{call(): Promise<string>}>()
-
-      await client.call()
-      await client.call()
-
-      assert.equal(Object.keys(sentClientCookies).length, 1)
-      assert.equal(sentClientCookies["name"], "value")
-
-      let resolveStopped = () => {}
-      const stopped = new Promise<void>((r) => (resolveStopped = r))
-      httpServer.closeAllConnections()
-      httpServer.close(() => resolveStopped())
-      await stopped
-    })
-
-    it("set cookie in http, use in ws", async () => {
-      const httpServer = http.createServer((req, res) => {
-        const headers: Record<string, string> = {
-          "Content-Type": "text/plain",
-          "Set-Cookie": "name=value; path=/; secure; samesite=none; httponly",
-        }
-
-        res.writeHead(200, headers)
-
-        res.end("ok")
-      })
-
-      const wss = new WebSocketServer({server: httpServer})
-
-      let sentClientCookies: Record<string, string> = {}
-      wss.on("connection", (ws: unknown, req: IncomingMessage) => {
-        sentClientCookies = parseCookies(req.headers.cookie || "")
-      })
-
-      let resolveStarted = () => {}
-      const started = new Promise<void>((r) => (resolveStarted = r))
-      httpServer.listen(TEST_PORT, () => resolveStarted())
-      await started
-
-      const client = await createTestClient<{call(): Promise<string>}>()
-      await client.call()
-
-      await client.call.subscribe(() => {})
-
-      assert.equal(Object.keys(sentClientCookies).length, 1)
-      assert.equal(sentClientCookies["name"], "value")
-
-      await testClient!.close()
-
-      let resolveStopped = () => {}
-      const stopped = new Promise<void>((r) => (resolveStopped = r))
-      httpServer.closeIdleConnections()
-      httpServer.closeAllConnections()
-      httpServer.close(() => resolveStopped())
-      await stopped
-    })
-  })
 })

package/tests/middleware.ts

@@ -1,5 +1,5 @@
 import {assert} from "chai"
-import {Middleware, withMiddlewares} from "../src/index.js"
+import {Middleware, setLogger, withMiddlewares} from "../src/index.js"
 import {createTestClient, startTestServer} from "./testUtils.js"
 import {adelay} from "../src/utils/promises.js"
 
@@ -109,4 +109,132 @@ describe("middleware", () => {
       assert.equal(e.message, "msg")
     }
   })
+
+  it("notifications middlewares", async () => {
+    let count = 1
+
+    const services = await startTestServer({
+      async remote(filter: {param: number}) {
+        return count++
+      },
+    })
+
+    const client = await createTestClient<typeof services>({
+      notificationsMiddleware: [
+        (ctx, next, r, params) => {
+          assert.ok(ctx.itemName)
+          assert.deepEqual(params, [{param: 1}])
+
+          return next((r as number) + 1)
+        },
+      ],
+    })
+
+    let response
+    await client.remote.subscribe(
+      (r) => {
+        response = r
+      },
+      {param: 1}
+    )
+
+    services.remote.trigger({param: 1})
+
+    await adelay(20)
+
+    assert.equal(response, 3)
+  })
+
+  it("error in notificationsMiddleware logged", async () => {
+    let log = ""
+
+    setLogger({
+      error(s: unknown, ...params) {
+        log += s + "\n" + params
+      },
+      warn: console.warn,
+      debug: console.debug,
+      info: console.info,
+    })
+
+    let count = 1
+    let result = 0
+
+    const services = await startTestServer({
+      async remote() {
+        return count++
+      },
+    })
+
+    const client = await createTestClient<typeof services>({
+      notificationsMiddleware: [
+        () => {
+          throw new Error("Test error")
+        },
+      ],
+    })
+
+    await client.remote.subscribe((r) => {
+      result = r
+    })
+
+    services.remote.trigger()
+
+    await adelay(20)
+
+    assert.equal(result, 1)
+
+    assert.include(log, "Test error")
+
+    setLogger(console)
+  })
+
+  it("error in client request middleware propagated", async () => {
+    let count = 1
+
+    const services = await startTestServer({
+      async remote() {
+        return count++
+      },
+    })
+
+    const client = await createTestClient<typeof services>({
+      middleware: [
+        () => {
+          throw new Error("Error")
+        },
+      ],
+    })
+
+    try {
+      await client.remote()
+      assert.fail("Expected to fail")
+    } catch (e) {}
+  })
+
+  it("error in server request middleware propagated", async () => {
+    let count = 1
+
+    const services = await startTestServer(
+      {
+        async remote() {
+          return count++
+        },
+      },
+      {
+        middleware: [
+          () => {
+            throw new Error("Error")
+          },
+        ],
+      }
+    )
+
+    const client = await createTestClient<typeof services>({})
+
+    try {
+      await client.remote()
+      assert.fail("Expected to fail")
+    } catch (e) {}
+  })
 })

package/tests/testUtils.ts

@@ -36,6 +36,12 @@ export let testClient: RpcClient | null = null
 export async function createTestClient<S extends Services<S>>(
   options?: Partial<ConsumeServicesOptions>
 ): Promise<ServicesWithSubscriptions<S>> {
+  if (!options) options = {}
+  if (!options.middleware) options.middleware = []
+  options.middleware = [logMiddleware, ...options.middleware]
+  if (!options.notificationsMiddleware) options.notificationsMiddleware = []
+  options.notificationsMiddleware = [logUpdatesMiddleware, ...options.notificationsMiddleware]
+
   const r = await consumeServices<S>(`http://127.0.0.1:${TEST_PORT}/rpc`, options)
   testClient = r.client
   return r.remote
@@ -53,3 +59,22 @@ afterEach(async function () {
     testServer = null
   }
 })
+
+async function logMiddleware(ctx: RpcContext, next: any, ...params: any) {
+  try {
+    console.log(`OUT:${ctx.invocationType} '${ctx.itemName}'`, ...params)
+
+    const r = await next()
+
+    console.log(`IN:${ctx.invocationType} '${ctx.itemName}'`, r)
+    return r
+  } catch (e) {
+    console.log(`ERR:${ctx.invocationType} '${ctx.itemName}'`, e)
+    throw e
+  }
+}
+
+async function logUpdatesMiddleware(ctx: RpcContext, next: any, res: any) {
+  console.log(`IN:${ctx.invocationType} '${ctx.itemName}'`, res)
+  return next()
+}

package/dist/client/HttpClient.d.ts

@@ -1,13 +0,0 @@
-import { ClientCookies } from "../utils/cookies.js";
-export declare class HttpClient {
-    private url;
-    private clientId;
-    private getHeaders;
-    private cookies;
-    constructor(url: string, clientId: string, getHeaders: () => Promise<Record<string, string>>, cookies: ClientCookies);
-    call(itemName: string, params: unknown[], callTimeout: number): Promise<unknown>;
-    subscribe(itemName: string, params: unknown[], callTimeout: number): Promise<unknown>;
-    unsubscribe(itemName: string, params: unknown[], callTimeout: number): Promise<void>;
-    private getItemUrl;
-    private httpRequest;
-}

package/dist/client/HttpClient.js

@@ -1,98 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpClient = void 0;
-const rpc_js_1 = require("../rpc.js");
-const json_js_1 = require("../utils/json.js");
-const env_js_1 = require("../utils/env.js");
-class HttpClient {
-    constructor(url, clientId, getHeaders, cookies) {
-        this.url = url;
-        this.clientId = clientId;
-        this.getHeaders = getHeaders;
-        this.cookies = cookies;
-    }
-    async call(itemName, params, callTimeout) {
-        return this.httpRequest("POST", itemName, params, callTimeout, await this.getHeaders());
-    }
-    async subscribe(itemName, params, callTimeout) {
-        return this.httpRequest("PUT", itemName, params, callTimeout, await this.getHeaders());
-    }
-    async unsubscribe(itemName, params, callTimeout) {
-        await this.httpRequest("PATCH", itemName, params, callTimeout, await this.getHeaders());
-    }
-    getItemUrl(itemName) {
-        return `${this.url}/${itemName}`;
-    }
-    async httpRequest(method, itemName, params, callTimeout, headers) {
-        const itemUrl = this.getItemUrl(itemName);
-        try {
-            const { signal, finished } = timeoutSignal(callTimeout);
-            if (env_js_1.environment != env_js_1.Environment.Browser) {
-                const cookie = this.cookies.getCookieString();
-                if (cookie) {
-                    headers["Cookie"] = cookie;
-                }
-            }
-            const response = await fetch(itemUrl, {
-                method,
-                headers: {
-                    "Content-Type": "application/json",
-                    [rpc_js_1.CLIENT_ID_HEADER]: this.clientId,
-                    ...headers,
-                },
-                body: (0, json_js_1.safeStringify)(params),
-                signal,
-            });
-            finished();
-            if (env_js_1.environment != env_js_1.Environment.Browser) {
-                const cookie = response.headers.get("set-cookie");
-                if (cookie) {
-                    this.cookies.updateCookies(cookie.split(","));
-                }
-            }
-            if (response.status == 204) {
-                return;
-            }
-            const contentType = response.headers.get("content-type");
-            const text = await response.text();
-            const res = contentType && contentType.includes("application/json") ? (0, json_js_1.safeParseJson)(text) : text;
-            if (response.status < 200 || response.status >= 300) {
-                const error = new Error(response.statusText);
-                Object.assign(error, { code: response.status });
-                if (typeof res == "object") {
-                    Object.assign(error, res);
-                }
-                throw error;
-            }
-            else {
-                return res;
-            }
-        }
-        catch (e) {
-            if (e.message == "Error" || !e.message) {
-                e.message = `Error ${e.code} while ${itemUrl}`;
-            }
-            if (e.message == "fetch failed" && e.cause) {
-                e = e.cause;
-            }
-            if (e.message?.toLowerCase()?.includes("timeout")) {
-                // NodeJS undici http client timeout
-                const error = new Error("Timeout");
-                Object.assign(error, { code: rpc_js_1.RpcErrors.Timeout });
-                throw error;
-            }
-            throw e;
-        }
-    }
-}
-exports.HttpClient = HttpClient;
-// AbortSignal.timeout polyfill for RN
-function timeoutSignal(time) {
-    const controller = new AbortController();
-    const timeout = setTimeout(() => controller.abort(new Error("TimeoutError")), time);
-    return {
-        signal: controller.signal,
-        finished: () => clearTimeout(timeout),
-    };
-}
-//# sourceMappingURL=HttpClient.js.map

package/dist/client/HttpClient.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"HttpClient.js","sourceRoot":"","sources":["../../src/client/HttpClient.ts"],"names":[],"mappings":"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"}