Merge pull request #326 from dajiaji/make-chacha20poly1305-ready-for-jsr

Move chacha20poly1305 impl to x/chacha20poly1305.

Author: dajiaji

.github/workflows/ci_bun.yml

@@ -25,34 +25,26 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: v20.x
-      - run: |
-          npm install -g esbuild
-          deno task dnt
-          deno task minify > test/runtimes/hpke.js
       - uses: antongolub/action-setup-bun@v1
         with:
           bun-version: ${{ matrix.bun-version }}
       - name: Install esbuild
         run: npm install -g esbuild
-      - name: Run dnt
-        run: deno run -A dnt.ts 0.0.0
-      - name: Run npm pack
+      - name: Prepare test for hpke-js
+        working-directory: ./
+        run: |
+          pwd
+          deno run -A dnt.ts 0.0.0
+          deno task minify > test/runtimes/hpke.js
+      - name: Run npm pack for hpke-js
         working-directory: ./npm
         run: npm pack
-      - name: Run test
-        working-directory: ./test/runtimes/bun
+      - name: Prepare test for core
+        working-directory: ./core
         run: |
-          bun install
-          nohup bun run src/index.ts &
-          sleep 3
-          deno test hpke.spec.ts --allow-net --config ../../../deno.json
-      - working-directory: ./core
-        run: |
-          deno task dnt
           deno run -A dnt.ts 0.0.0
           deno task minify > ../x/dhkem-x25519/test/runtimes/hpke-core.js
           deno task minify > ../x/dhkem-x448/test/runtimes/hpke-core.js
-          deno task minify > ../x/chacha20poly1305/test/runtimes/hpke-core.js
           deno task minify > ../x/hybridkem-x25519-kyber768/test/runtimes/hpke-core.js
           deno task minify > ../x/dhkem-secp256k1/test/runtimes/hpke-core.js
       - name: Run npm pack for core
@@ -65,6 +57,13 @@ jobs:
           nohup bun src/index.ts &
           sleep 3
           deno test core.spec.ts --allow-net --config ../../../deno.json
+      - name: Run test for hpke-js
+        working-directory: ./test/runtimes/bun
+        run: |
+          bun install
+          nohup bun run src/index.ts &
+          sleep 3
+          deno test hpke.spec.ts --allow-net --config ../../../deno.json
       - working-directory: ./x/dhkem-x25519
         run: |
           deno task dnt
@@ -88,13 +87,17 @@ jobs:
       - working-directory: ./x/chacha20poly1305
         run: |
           deno task dnt
-          deno task minify > test/runtimes/hpke-chacha20poly1305.js
+          deno run -A dnt.ts 0.0.0
+      - name: Run npm pack for chacha20poly1305
+        working-directory: ./x/chacha20poly1305/npm
+        run: npm pack
       - name: Run test for chacha20poly1305
         working-directory: ./x/chacha20poly1305/test/runtimes/bun
         run: |
-          nohup bun src/index.js &
+          bun install
+          nohup bun src/index.ts &
           sleep 3
-          deno test chacha20poly1305.spec.ts --allow-net
+          deno test chacha20poly1305.spec.ts --allow-net --config ../../../deno.json
       - working-directory: ./x/hybridkem-x25519-kyber768
         run: |
           deno task dnt

deno.json

@@ -4,23 +4,29 @@
   "exports": "./mod.ts",
   "imports": {
     "@deno/dnt": "jsr:@deno/dnt@^0.41.2",
+    "@hpke/core": "jsr:@hpke/core@^1.2.9",
     "@std/assert": "jsr:@std/[email protected]",
     "@std/testing": "jsr:@std/testing@^1.0.0"
   },
   "publish": {
+    "include": [
+      "README.md",
+      "core/",
+      "deno.json",
+      "deno.lock",
+      "mod.ts",
+      "src/",
+      "x/chacha20poly1305/src/"
+    ],
     "exclude": [
-      ".github/",
       "core/LICENSE",
       "core/README.md",
       "core/deno.json",
       "core/deno.lock",
       "core/dnt.ts",
+      "core/samples/",
       "core/test/",
-      "core/tsconfig.json",
-      "dnt.ts",
-      "samples/",
-      "test/",
-      "x/"
+      "core/tsconfig.json"
     ]
   },
   "fmt": {

deno.lock

@@ -22,7 +22,7 @@ await build({
   test: true,
   declaration: "inline",
   scriptModule: "umd",
-  importMap: "./deno.json",
+  importMap: "./import_map_for_dnt.json",
   compilerOptions: {
     lib: ["ES2022", "DOM"],
   },

dnt.ts

@@ -0,0 +1,8 @@
+{
+  "imports": {
+    "@deno/dnt": "jsr:@deno/dnt@^0.41.2",
+    "@hpke/core": "npm:@hpke/core@^1.2.9",
+    "@std/assert": "jsr:@std/[email protected]",
+    "@std/testing": "jsr:@std/testing@^1.0.0"
+  }
+}

import_map_for_dnt.json

@@ -3,7 +3,7 @@ import type { KemInterface } from "../core/src/interfaces/kemInterface.ts";
 
 import { Aes128Gcm, Aes256Gcm } from "../core/src/aeads/aesGcm.ts";
 import { ExportOnly } from "../core/src/aeads/exportOnly.ts";
-import { Chacha20Poly1305 } from "./aeads/chacha20Poly1305.ts";
+import { Chacha20Poly1305 } from "../x/chacha20poly1305/src/chacha20Poly1305.ts";
 import { InvalidParamError } from "../core/src/errors.ts";
 import { HkdfSha256 } from "./kdfs/hkdfSha256.ts";
 import { HkdfSha384 } from "./kdfs/hkdfSha384.ts";

src/cipherSuite.ts

@@ -9,7 +9,7 @@ import {
   KemId,
 } from "../mod.ts";
 import { Aes128Gcm, Aes256Gcm } from "../core/src/aeads/aesGcm.ts";
-import { Chacha20Poly1305 } from "../src/aeads/chacha20Poly1305.ts";
+import { Chacha20Poly1305 } from "../x/chacha20poly1305/mod.ts";
 import { ExportOnly } from "../core/src/aeads/exportOnly.ts";
 import { CipherSuiteNative } from "../core/src/cipherSuiteNative.ts";
 import {

test/cipherSuiteNative.test.ts

@@ -9,6 +9,7 @@
     "typescript": "^5.0.0"
   },
   "dependencies": {
-    "@dajiaji/hpke": "file:../../../npm/hpke-js-0.0.0.tgz"
+    "@dajiaji/hpke": "file:../../../npm/hpke-js-0.0.0.tgz",
+    "@hpke/core": "file:../../../core/npm/hpke-core-0.0.0.tgz"
   }
 }

test/runtimes/bun/bun.lockb

@@ -7,6 +7,9 @@
     "moduleDetection": "force",
     "jsx": "react-jsx",
     "allowJs": true,
+    "paths": {
+      "@hpke/core": ["../../../core/mod.ts"]
+    },
 
     // Bundler mode
     "moduleResolution": "bundler",