@linebridge/engine-neo 1.0.7 → 1.1.0

package/lib/cookie.d.ts

@@ -0,0 +1,2 @@
+export declare function sign(value: string, secret: string): string;
+export declare function unsign(signed_value: string, secret: string): string | undefined;

package/lib/cookie.js

@@ -0,0 +1,23 @@
+import * as crypto from "node:crypto";
+export function sign(value, secret) {
+    const mac = crypto
+        .createHmac("sha256", secret)
+        .update(value)
+        .digest("base64")
+        .replace(/=+$/, "");
+    return `${value}.${mac}`;
+}
+export function unsign(signed_value, secret) {
+    const lastDot = signed_value.lastIndexOf(".");
+    if (lastDot === -1)
+        return undefined;
+    const value = signed_value.slice(0, lastDot);
+    const expectedSignature = sign(value, secret);
+    const expectedBuffer = Buffer.from(expectedSignature);
+    const providedBuffer = Buffer.from(signed_value);
+    if (expectedBuffer.length === providedBuffer.length &&
+        crypto.timingSafeEqual(expectedBuffer, providedBuffer)) {
+        return value;
+    }
+    return undefined;
+}

package/lib/request.d.ts

@@ -5,9 +5,8 @@
  * body parsing (JSON, text, urlencoded, buffer), cookies, IP resolution,
  * and path/query parameters.
  */
+import { sign, unsign } from "./cookie.js";
 import type { uWebsockets } from "./uws.js";
-type HttpRequest = uWebsockets.HttpRequest;
-type HttpResponse = uWebsockets.HttpResponse;
 import type { Request as BaseHttpRequest } from "linebridge/classes/Handler/http";
 import type { EngineAdaptor } from "linebridge/classes/EngineAdaptor/index";
 import type { Route } from "linebridge/classes/Route/index";
@@ -46,9 +45,9 @@ export default class Request<TServer = Server<any>> implements BaseHttpRequest {
     /** Parsed query string parameters (lazy). */
     _query_parameters: any;
     /** The raw uWS HttpRequest object. */
-    _raw_request: HttpRequest;
+    _raw_request: uWebsockets.HttpRequest;
     /** The raw uWS HttpResponse object (needed for `onData` and `getRemoteAddress`). */
-    _raw_response: HttpResponse;
+    _raw_response: uWebsockets.HttpResponse;
     /** Request headers extracted synchronously. */
     _headers: Record<string, string>;
     /** Whether all body chunks have been received. */
@@ -74,7 +73,7 @@ export default class Request<TServer = Server<any>> implements BaseHttpRequest {
     /**
      * Creates a Request instance from raw uWS objects.
      */
-    static create<TServer extends Server<any>>(route: Route<TServer>, raw_request: HttpRequest, raw_response: HttpResponse): Request<TServer>;
+    static create<TServer extends Server<any>>(route: Route<TServer>, raw_request: uWebsockets.HttpRequest, raw_response: uWebsockets.HttpResponse): Request<TServer>;
     /**
      * The engine that owns this request.
      */
@@ -82,7 +81,7 @@ export default class Request<TServer = Server<any>> implements BaseHttpRequest {
     /**
      * The raw uWS HttpRequest.
      */
-    get raw(): HttpRequest;
+    get raw(): uWebsockets.HttpRequest;
     /**
      * Lazily-parsed headers as a plain object.
      * Header names are lowercased by uWS.
@@ -98,13 +97,13 @@ export default class Request<TServer = Server<any>> implements BaseHttpRequest {
      */
     resume(): this;
     /**
-     * Signs a string with a secret using the same algorithm as `cookie-signature`.
+     * Signs a string with a secret
      */
-    sign(string: string, secret: string): any;
+    sign: typeof sign;
     /**
      * Unsigns a signed value. Returns the original string or `undefined` on failure.
      */
-    unsign(signed_value: string, secret: string): any;
+    unsign: typeof unsign;
     /**
      * Starts the body parser by registering a uWS `onData` callback.
      *
@@ -168,4 +167,3 @@ export default class Request<TServer = Server<any>> implements BaseHttpRequest {
      */
     get proxy_ip(): string;
 }
-export {};

package/lib/request.js

@@ -6,8 +6,8 @@
  * and path/query parameters.
  */
 import * as cookie from "cookie";
+import { sign, unsign } from "./cookie.js";
 import querystring from "fast-querystring";
-import signature from "cookie-signature";
 /**
  * HTTP Request class wrapping a uWS HttpRequest.
  *
@@ -138,18 +138,13 @@ export default class Request {
         return this;
     }
     /**
-     * Signs a string with a secret using the same algorithm as `cookie-signature`.
+     * Signs a string with a secret
      */
-    sign(string, secret) {
-        return signature.sign(string, secret);
-    }
+    sign = sign;
     /**
      * Unsigns a signed value. Returns the original string or `undefined` on failure.
      */
-    unsign(signed_value, secret) {
-        const unsigned_value = signature.unsign(signed_value, secret);
-        return unsigned_value !== false ? unsigned_value : undefined;
-    }
+    unsign = unsign;
     /**
      * Starts the body parser by registering a uWS `onData` callback.
      *

package/lib/response.d.ts

@@ -7,7 +7,6 @@
  */
 import SSEventStream from "./SSEventStream.js";
 import type { uWebsockets } from "./uws.js";
-type HttpResponse = uWebsockets.HttpResponse;
 import type { EngineAdaptor } from "linebridge/classes/EngineAdaptor/index";
 import type { Route } from "linebridge/classes/Route/index";
 import type { Server } from "linebridge/server";
@@ -39,7 +38,7 @@ export default class Response<TServer = Server<any>> implements BaseHttpResponse
     /** The uWS upgrade socket (WebSocket upgrade requests only). */
     _upgrade_socket: any;
     /** The raw uWS HttpResponse object. */
-    _raw_response: HttpResponse | null;
+    _raw_response: uWebsockets.HttpResponse | null;
     /** HTTP status code (defaults to 200). */
     _status_code: number;
     /** Custom status message (overrides the default from STATUS_CODES). */
@@ -71,7 +70,7 @@ export default class Response<TServer = Server<any>> implements BaseHttpResponse
      * pending request counter, stops body parsing on the paired request, and
      * fires abort/close event listeners.
      */
-    static create<TServer extends Server<any>>(raw_response: HttpResponse, route: Route<TServer>, request: any, socket: any): Response<TServer>;
+    static create<TServer extends Server<any>>(raw_response: uWebsockets.HttpResponse, route: Route<TServer>, request: any, socket: any): Response<TServer>;
     /**
      * Registers an event listener on the response.
      * Supported events: `"abort"`, `"close"`, `"finish"`.
@@ -198,7 +197,7 @@ export default class Response<TServer = Server<any>> implements BaseHttpResponse
     /**
      * The raw uWS HttpResponse.
      */
-    get raw(): HttpResponse | null;
+    get raw(): uWebsockets.HttpResponse | null;
     /**
      * Whether the response has been aborted by the client.
      */

package/lib/response.js

@@ -5,9 +5,9 @@
  * headers, cookies (with signed cookie support), streaming, file serving,
  * Server-Sent Events, redirects, and JSON/HTML shortcuts.
  */
-import * as cookie from "cookie";
-import signature from "cookie-signature";
 import { STATUS_CODES } from "http";
+import * as cookie from "cookie";
+import { sign } from "./cookie.js";
 import mime_types from "mime-types";
 import SSEventStream from "./SSEventStream.js";
 const stringify = JSON.stringify;
@@ -237,7 +237,7 @@ export default class Response {
         }
         if (sign_cookie && typeof options.secret === "string") {
             options.encode = false;
-            value = signature.sign(value, options.secret);
+            value = sign(value, options.secret);
         }
         if (this._cookies === null) {
             this._cookies = Object.create(null);

package/lib/uws.js

@@ -11,17 +11,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { createRequire } from "node:module";
+import os from "node:os";
 let uws_wrapper;
-try {
-    uws_wrapper = createRequire(import.meta.url)("../uws-wrapper.node");
+if (process.env.IS_BUNDLED) {
+    // @ts-ignore
+    const mod = await import("../uws-wrapper.node");
+    uws_wrapper = mod.default ?? mod;
 }
-catch (e) {
+else {
     try {
-        uws_wrapper = createRequire(import.meta.url)("../build/Release/uws-wrapper.node");
+        uws_wrapper = await import(import.meta.resolve("../uws-wrapper.node"));
     }
-    catch (e2) {
-        uws_wrapper = createRequire(import.meta.url)("../build/out/uws-wrapper.node");
+    catch (e) {
+        uws_wrapper = await import(import.meta.resolve(`../build/Release/uws-wrapper-${os.arch()}.node`));
+    }
+    if (uws_wrapper) {
+        // @ts-ignore
+        uws_wrapper = uws_wrapper.default ?? uws_wrapper;
     }
 }
 export default uws_wrapper;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@linebridge/engine-neo",
-  "version": "1.0.7",
+  "version": "1.1.0",
   "publishConfig": {
     "access": "public"
   },
@@ -28,7 +28,6 @@
   "dependencies": {
     "busboy": "^1.6.0",
     "cookie": "^2.0.1",
-    "cookie-signature": "^1.2.2",
     "fast-json-stringify": "^7.0.1",
     "fast-querystring": "^1.1.2",
     "mime-types": "^3.0.2",