fixes

xmppjs · Dec 21, 2024 · 7ce1b2f · 7ce1b2f
1 parent 54db23a
commit 7ce1b2f
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 79 deletions.
diff --git a/Makefile b/Makefile
@@ -19,20 +19,14 @@ test:
 
 ci:
 	npm install
-	make unit
+	npm run test
 	make lint
 	make restart
 	npx lerna run prepublish
 	node bundle.js
-	make e2e
+	npm run e2e
 	make bundlesize
 
-unit:
-	npx jest
-
-e2e:
-	NODE_TLS_REJECT_UNAUTHORIZED=0 npx jest --runInBand --config e2e.config.cjs
-
 clean:
 	make stop
 	rm -f server/localhost.key

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,6 +36,8 @@
     "uglify-js": "^3.19.3"
   },
   "scripts": {
+    "test": "npx jest",
+    "e2e": "NODE_TLS_REJECT_UNAUTHORIZED=0 npx jest --runInBand --config e2e.config.cjs",
     "preversion": "make bundle"
   },
   "engines": {

diff --git a/packages/sasl-ht-sha-256-none/index.js b/packages/sasl-ht-sha-256-none/index.js
@@ -1,7 +1,5 @@
-"use strict";
-
 // https://datatracker.ietf.org/doc/draft-schmaus-kitten-sasl-ht/
-const createHmac = require("create-hmac");
+import createHmac from "create-hmac";
 
 function Mechanism() {}
 
@@ -24,6 +22,6 @@ Mechanism.prototype.final = (data) => {
   }
 };
 
-module.exports = function sasl2(sasl) {
+export default function sasl2(sasl) {
   sasl.use(Mechanism);
-};
+}
diff --git a/packages/sasl-ht-sha-256-none/package.json b/packages/sasl-ht-sha-256-none/package.json
@@ -6,6 +6,7 @@
   "bugs": "http://github.com/xmppjs/xmpp.js/issues",
   "version": "0.13.0",
   "license": "ISC",
+  "type": "module",
   "keywords": [
     "XMPP",
     "sasl",

diff --git a/packages/sasl2/index.js b/packages/sasl2/index.js
@@ -1,10 +1,8 @@
-"use strict";
-
-const { encode, decode } = require("@xmpp/base64");
-const SASLError = require("./lib/SASLError");
-const jid = require("@xmpp/jid");
-const xml = require("@xmpp/xml");
-const SASLFactory = require("saslmechanisms");
+import { encode, decode } from "@xmpp/base64";
+import SASLError from "@xmpp/sasl/lib/SASLError.js";
+import jid from "@xmpp/jid";
+import xml from "@xmpp/xml";
+import SASLFactory from "saslmechanisms";
 
 // https://xmpp.org/extensions/xep-0388.html
 // https://xmpp.org/extensions/xep-0386.html
@@ -164,7 +162,7 @@ async function authenticate(
   await Promise.all([promise, ...hPromises]);
 }
 
-module.exports = function sasl2({ streamFeatures }, credentials, userAgent) {
+export default function sasl2({ streamFeatures }, credentials, userAgent) {
   const SASL = new SASLFactory();
   const handlers = {};
   const bindHandlers = {};
@@ -195,20 +193,18 @@ module.exports = function sasl2({ streamFeatures }, credentials, userAgent) {
       .filter((mech) => mech.canFast || mech.canOther);
 
     if (typeof credentials === "function") {
-      await credentials(
-        (creds, mech) =>
-          authenticate(
-            SASL,
-            handlers,
-            bindHandlers,
-            entity,
-            mech,
-            creds,
-            userAgent,
-            stanza,
-          ),
-        intersection,
-      );
+      await credentials((creds, mech) => {
+        authenticate(
+          SASL,
+          handlers,
+          bindHandlers,
+          entity,
+          mech,
+          creds,
+          userAgent,
+          stanza,
+        );
+      }, intersection);
     } else {
       let mech = intersection[0]?.name;
       if (!credentials.username && !credentials.password) {
@@ -241,4 +237,4 @@ module.exports = function sasl2({ streamFeatures }, credentials, userAgent) {
       bindHandlers[feature] = handler;
     },
   };
-};
+}
diff --git a/packages/sasl2/lib/SASLError.js b/packages/sasl2/lib/SASLError.js
@@ -1,6 +1,4 @@
-"use strict";
-
-const XMPPError = require("@xmpp/error");
+import XMPPError from "@xmpp/error";
 
 // https://xmpp.org/rfcs/rfc6120.html#sasl-errors
 
@@ -11,4 +9,4 @@ class SASLError extends XMPPError {
   }
 }
 
-module.exports = SASLError;
+export default SASLError;
diff --git a/packages/sasl2/package.json b/packages/sasl2/package.json
@@ -6,13 +6,15 @@
   "bugs": "http://github.com/xmppjs/xmpp.js/issues",
   "version": "0.13.0",
   "license": "ISC",
+  "type": "module",
   "keywords": [
     "XMPP",
     "sasl"
   ],
   "dependencies": {
     "@xmpp/base64": "^0.13.0",
     "@xmpp/error": "^0.13.0",
+    "@xmpp/sasl": "^0.13.2",
     "@xmpp/jid": "^0.13.0",
     "@xmpp/xml": "^0.13.0",
     "saslmechanisms": "^0.1.1"

diff --git a/packages/sasl2/test.js b/packages/sasl2/test.js
@@ -1,14 +1,11 @@
-"use strict";
-
-const test = require("ava");
-const { mockClient, promise } = require("@xmpp/test");
-const parse = require("@xmpp/xml/lib/parse.js");
+import { mockClient, promise } from "@xmpp/test";
+import parse from "@xmpp/xml/lib/parse.js";
 
 const username = "foo";
 const password = "bar";
 const credentials = { username, password };
 
-test("no compatibles mechanisms", async (t) => {
+test("no compatibles mechanisms", async () => {
   const { entity } = mockClient({ username, password });
 
   entity.mockInput(
@@ -20,11 +17,11 @@ test("no compatibles mechanisms", async (t) => {
   );
 
   const error = await promise(entity, "error");
-  t.true(error instanceof Error);
-  t.is(error.message, "No compatible mechanism");
+  expect(error instanceof Error).toBe(true);
+  expect(error.message).toBe("No compatible mechanism");
 });
 
-test("with object credentials", async (t) => {
+test("with object credentials", async () => {
   const { entity } = mockClient({ credentials });
 
   entity.mockInput(
@@ -35,8 +32,7 @@ test("with object credentials", async (t) => {
     </features>,
   );
 
-  t.deepEqual(
-    await promise(entity, "send"),
+  expect(await promise(entity, "send")).toEqual(
     <authenticate xmlns="urn:xmpp:sasl:2" mechanism="PLAIN">
       <initial-response>AGZvbwBiYXI=</initial-response>
     </authenticate>,
@@ -48,11 +44,13 @@ test("with object credentials", async (t) => {
   await promise(entity, "online");
 });
 
-test("with function credentials", async (t) => {
+test("with function credentials", async () => {
   const mech = "PLAIN";
 
   function authenticate(auth, mechanisms) {
-    t.deepEqual(mechanisms, [{ name: mech, canFast: false, canOther: true }]);
+    expect(mechanisms).toEqual([
+      { name: mech, canFast: false, canOther: true },
+    ]);
     return auth(credentials, mech);
   }
 
@@ -66,8 +64,7 @@ test("with function credentials", async (t) => {
     </features>,
   );
 
-  t.deepEqual(
-    await promise(entity, "send"),
+  expect(await promise(entity, "send")).toEqual(
     <authenticate xmlns="urn:xmpp:sasl:2" mechanism={mech}>
       <initial-response>AGZvbwBiYXI=</initial-response>
     </authenticate>,
@@ -79,7 +76,7 @@ test("with function credentials", async (t) => {
   await promise(entity, "online");
 });
 
-test("failure", async (t) => {
+test("failure", async () => {
   const { entity } = mockClient({ credentials });
 
   entity.mockInput(
@@ -90,8 +87,7 @@ test("failure", async (t) => {
     </features>,
   );
 
-  t.deepEqual(
-    await promise(entity, "send"),
+  expect(await promise(entity, "send")).toEqual(
     <authenticate xmlns="urn:xmpp:sasl:2" mechanism="PLAIN">
       <initial-response>AGZvbwBiYXI=</initial-response>
     </authenticate>,
@@ -106,13 +102,13 @@ test("failure", async (t) => {
   entity.mockInput(failure);
 
   const error = await promise(entity, "error");
-  t.true(error instanceof Error);
-  t.is(error.name, "SASLError");
-  t.is(error.condition, "some-condition");
-  t.is(error.element, failure);
+  expect(error instanceof Error).toBe(true);
+  expect(error.name).toBe("SASLError");
+  expect(error.condition).toBe("some-condition");
+  expect(error.element).toBe(failure);
 });
 
-test("prefers SCRAM-SHA-1", async (t) => {
+test("prefers SCRAM-SHA-1", async () => {
   const { entity } = mockClient({ credentials });
 
   entity.mockInput(
@@ -126,10 +122,10 @@ test("prefers SCRAM-SHA-1", async (t) => {
   );
 
   const result = await promise(entity, "send");
-  t.deepEqual(result.attrs.mechanism, "SCRAM-SHA-1");
+  expect(result.attrs.mechanism).toEqual("SCRAM-SHA-1");
 });
 
-test("use ANONYMOUS if username and password are not provided", async (t) => {
+test("use ANONYMOUS if username and password are not provided", async () => {
   const { entity } = mockClient();
 
   entity.mockInput(
@@ -143,10 +139,10 @@ test("use ANONYMOUS if username and password are not provided", async (t) => {
   );
 
   const result = await promise(entity, "send");
-  t.deepEqual(result.attrs.mechanism, "ANONYMOUS");
+  expect(result.attrs.mechanism).toEqual("ANONYMOUS");
 });
 
-test("with whitespaces", async (t) => {
+test("with whitespaces", async () => {
   const { entity } = mockClient();
 
   entity.mockInput(
@@ -164,10 +160,10 @@ test("with whitespaces", async (t) => {
   );
 
   const result = await promise(entity, "send");
-  t.deepEqual(result.attrs.mechanism, "ANONYMOUS");
+  expect(result.attrs.mechanism).toEqual("ANONYMOUS");
 });
 
-test("with bind2", async (t) => {
+test("with bind2", async () => {
   const { entity } = mockClient({
     credentials,
     clientId: "uniqueid",
@@ -186,8 +182,7 @@ test("with bind2", async (t) => {
     </features>,
   );
 
-  t.deepEqual(
-    await promise(entity, "send"),
+  expect(await promise(entity, "send")).toEqual(
     <authenticate xmlns="urn:xmpp:sasl:2" mechanism="PLAIN">
       <initial-response>AGZvbwBiYXI=</initial-response>
       <user-agent id="uniqueid">
@@ -206,10 +201,10 @@ test("with bind2", async (t) => {
   await promise(entity, "online");
 });
 
-test("with FAST", async (t) => {
+test("with FAST", async () => {
   const { entity } = mockClient({
     credentials: (callback, mechanisms) => {
-      t.deepEqual(mechanisms, [
+      expect(mechanisms).toEqual([
         { canFast: true, canOther: false, name: "HT-SHA-256-NONE" },
         { canFast: false, canOther: true, name: "PLAIN" },
       ]);
@@ -233,8 +228,7 @@ test("with FAST", async (t) => {
     </features>,
   );
 
-  t.deepEqual(
-    await promise(entity, "send"),
+  expect(await promise(entity, "send")).toEqual(
     <authenticate xmlns="urn:xmpp:sasl:2" mechanism="PLAIN">
       <initial-response>AGZvbwBiYXI=</initial-response>
       <request-token xmlns="urn:xmpp:fast:0" mechanism="HT-SHA-256-NONE" />
@@ -247,10 +241,10 @@ test("with FAST", async (t) => {
   await promise(entity, "online");
 });
 
-test("with FAST token", async (t) => {
+test("with FAST token", async () => {
   const { entity } = mockClient({
     credentials: (callback, mechanisms) => {
-      t.deepEqual(mechanisms, [
+      expect(mechanisms).toEqual([
         { canFast: true, canOther: false, name: "HT-SHA-256-NONE" },
         { canFast: false, canOther: true, name: "PLAIN" },
       ]);
@@ -271,8 +265,7 @@ test("with FAST token", async (t) => {
     </features>,
   );
 
-  t.deepEqual(
-    await promise(entity, "send"),
+  expect(await promise(entity, "send")).toEqual(
     <authenticate xmlns="urn:xmpp:sasl:2" mechanism="HT-SHA-256-NONE">
       <initial-response>
         bnVsbAAAXAywUfR/w4Mr9SUDUtNAgPDajNI073fqfiZLMYcmfA==