@fedify/vocab-runtime 2.0.6 → 2.0.7-dev.586
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/deno.json +4 -3
- package/dist/chunk-CUT6urMc.cjs +30 -0
- package/dist/jsonld.cjs +8 -0
- package/dist/jsonld.d.cts +6 -0
- package/dist/jsonld.d.ts +6 -0
- package/dist/jsonld.js +7 -0
- package/dist/mod.cjs +61 -44
- package/dist/mod.js +49 -10
- package/dist/tests/docloader.test.cjs +1 -1
- package/dist/tests/docloader.test.js +1 -1
- package/dist/tests/internal/multicodec.test.cjs +77 -0
- package/dist/tests/internal/multicodec.test.d.cts +1 -0
- package/dist/tests/internal/multicodec.test.d.ts +1 -0
- package/dist/tests/internal/multicodec.test.js +76 -0
- package/dist/tests/key.test.cjs +10 -8
- package/dist/tests/key.test.js +11 -9
- package/dist/tests/multibase/multibase.test.cjs +1 -1
- package/dist/tests/multibase/multibase.test.js +1 -1
- package/dist/tests/multicodec-DvC5xnX2.js +41 -0
- package/dist/tests/multicodec-mHcRzSGY.cjs +59 -0
- package/dist/tests/{request-Dlac5CA8.js → request-CvrhEgps.js} +6 -3
- package/dist/tests/{request-B7jBLGoM.cjs → request-DHjhMKWk.cjs} +6 -3
- package/dist/tests/request.test.cjs +1 -1
- package/dist/tests/request.test.js +1 -1
- package/package.json +12 -2
- package/src/internal/multicodec.test.ts +68 -0
- package/src/internal/multicodec.ts +53 -0
- package/src/jsonld.ts +4 -0
- package/src/key.test.ts +22 -1
- package/src/key.ts +9 -8
- package/tsdown.config.ts +1 -1
- /package/dist/tests/{multibase-BFbBiaPE.cjs → multibase-B2D6B0V4.cjs} +0 -0
- /package/dist/tests/{multibase-DStmqni9.js → multibase-BdHCGO4H.js} +0 -0
package/deno.json
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fedify/vocab-runtime",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.7-dev.586+b3928d60",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"exports": {
|
|
6
|
-
".": "./src/mod.ts"
|
|
6
|
+
".": "./src/mod.ts",
|
|
7
|
+
"./jsonld": "./src/jsonld.ts"
|
|
7
8
|
},
|
|
8
9
|
"description": "Runtime library for @fedify/vocab",
|
|
9
10
|
"author": {
|
|
@@ -16,7 +17,7 @@
|
|
|
16
17
|
"asn1js": "npm:asn1js@^3.0.6",
|
|
17
18
|
"byte-encodings": "npm:byte-encodings@^1.0.11",
|
|
18
19
|
"fetch-mock": "npm:fetch-mock@^12.5.4",
|
|
19
|
-
"
|
|
20
|
+
"jsonld": "npm:jsonld@^9.0.0",
|
|
20
21
|
"pkijs": "npm:pkijs@^3.2.5"
|
|
21
22
|
},
|
|
22
23
|
"exclude": [
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
//#region rolldown:runtime
|
|
2
|
+
var __create = Object.create;
|
|
3
|
+
var __defProp = Object.defineProperty;
|
|
4
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
5
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
6
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
7
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
8
|
+
var __copyProps = (to, from, except, desc) => {
|
|
9
|
+
if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
|
|
10
|
+
key = keys[i];
|
|
11
|
+
if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
|
|
12
|
+
get: ((k) => from[k]).bind(null, key),
|
|
13
|
+
enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
|
|
14
|
+
});
|
|
15
|
+
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
|
|
19
|
+
value: mod,
|
|
20
|
+
enumerable: true
|
|
21
|
+
}) : target, mod));
|
|
22
|
+
|
|
23
|
+
//#endregion
|
|
24
|
+
|
|
25
|
+
Object.defineProperty(exports, '__toESM', {
|
|
26
|
+
enumerable: true,
|
|
27
|
+
get: function () {
|
|
28
|
+
return __toESM;
|
|
29
|
+
}
|
|
30
|
+
});
|
package/dist/jsonld.cjs
ADDED
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
const require_chunk = require('./chunk-CUT6urMc.cjs');
|
|
2
|
+
const jsonld_dist_jsonld_esm_js = require_chunk.__toESM(require("jsonld/dist/jsonld.esm.js"));
|
|
3
|
+
|
|
4
|
+
//#region src/jsonld.ts
|
|
5
|
+
var jsonld_default = jsonld_dist_jsonld_esm_js.default;
|
|
6
|
+
|
|
7
|
+
//#endregion
|
|
8
|
+
module.exports = jsonld_default;
|
package/dist/jsonld.d.ts
ADDED
package/dist/jsonld.js
ADDED
package/dist/mod.cjs
CHANGED
|
@@ -1,39 +1,15 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
|
|
14
|
-
});
|
|
15
|
-
}
|
|
16
|
-
return to;
|
|
17
|
-
};
|
|
18
|
-
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
|
|
19
|
-
value: mod,
|
|
20
|
-
enumerable: true
|
|
21
|
-
}) : target, mod));
|
|
22
|
-
|
|
23
|
-
//#endregion
|
|
24
|
-
const __logtape_logtape = __toESM(require("@logtape/logtape"));
|
|
25
|
-
const __opentelemetry_api = __toESM(require("@opentelemetry/api"));
|
|
26
|
-
const node_process = __toESM(require("node:process"));
|
|
27
|
-
const node_dns_promises = __toESM(require("node:dns/promises"));
|
|
28
|
-
const node_net = __toESM(require("node:net"));
|
|
29
|
-
const asn1js = __toESM(require("asn1js"));
|
|
30
|
-
const byte_encodings_base64 = __toESM(require("byte-encodings/base64"));
|
|
31
|
-
const byte_encodings_base64url = __toESM(require("byte-encodings/base64url"));
|
|
32
|
-
const byte_encodings_hex = __toESM(require("byte-encodings/hex"));
|
|
33
|
-
const multicodec = __toESM(require("multicodec"));
|
|
34
|
-
const node_crypto = __toESM(require("node:crypto"));
|
|
35
|
-
const pkijs = __toESM(require("pkijs"));
|
|
36
|
-
const __multiformats_base_x = __toESM(require("@multiformats/base-x"));
|
|
1
|
+
const require_chunk = require('./chunk-CUT6urMc.cjs');
|
|
2
|
+
const __logtape_logtape = require_chunk.__toESM(require("@logtape/logtape"));
|
|
3
|
+
const __opentelemetry_api = require_chunk.__toESM(require("@opentelemetry/api"));
|
|
4
|
+
const node_process = require_chunk.__toESM(require("node:process"));
|
|
5
|
+
const node_dns_promises = require_chunk.__toESM(require("node:dns/promises"));
|
|
6
|
+
const node_net = require_chunk.__toESM(require("node:net"));
|
|
7
|
+
const asn1js = require_chunk.__toESM(require("asn1js"));
|
|
8
|
+
const byte_encodings_base64 = require_chunk.__toESM(require("byte-encodings/base64"));
|
|
9
|
+
const byte_encodings_base64url = require_chunk.__toESM(require("byte-encodings/base64url"));
|
|
10
|
+
const node_crypto = require_chunk.__toESM(require("node:crypto"));
|
|
11
|
+
const pkijs = require_chunk.__toESM(require("pkijs"));
|
|
12
|
+
const __multiformats_base_x = require_chunk.__toESM(require("@multiformats/base-x"));
|
|
37
13
|
|
|
38
14
|
//#region src/contexts.ts
|
|
39
15
|
const preloadedContexts = {
|
|
@@ -4287,9 +4263,12 @@ var contexts_default = preloadedContexts;
|
|
|
4287
4263
|
//#endregion
|
|
4288
4264
|
//#region deno.json
|
|
4289
4265
|
var name = "@fedify/vocab-runtime";
|
|
4290
|
-
var version = "2.0.
|
|
4266
|
+
var version = "2.0.7-dev.586+b3928d60";
|
|
4291
4267
|
var license = "MIT";
|
|
4292
|
-
var exports$1 = {
|
|
4268
|
+
var exports$1 = {
|
|
4269
|
+
".": "./src/mod.ts",
|
|
4270
|
+
"./jsonld": "./src/jsonld.ts"
|
|
4271
|
+
};
|
|
4293
4272
|
var description = "Runtime library for @fedify/vocab";
|
|
4294
4273
|
var author = {
|
|
4295
4274
|
"name": "Hong Minhee",
|
|
@@ -4301,7 +4280,7 @@ var imports = {
|
|
|
4301
4280
|
"asn1js": "npm:asn1js@^3.0.6",
|
|
4302
4281
|
"byte-encodings": "npm:byte-encodings@^1.0.11",
|
|
4303
4282
|
"fetch-mock": "npm:fetch-mock@^12.5.4",
|
|
4304
|
-
"
|
|
4283
|
+
"jsonld": "npm:jsonld@^9.0.0",
|
|
4305
4284
|
"pkijs": "npm:pkijs@^3.2.5"
|
|
4306
4285
|
};
|
|
4307
4286
|
var exclude = ["dist", "node_modules"];
|
|
@@ -4810,6 +4789,46 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
|
|
|
4810
4789
|
return load;
|
|
4811
4790
|
}
|
|
4812
4791
|
|
|
4792
|
+
//#endregion
|
|
4793
|
+
//#region src/internal/multicodec.ts
|
|
4794
|
+
const INVALID_MULTICODEC_PREFIX = "Invalid multicodec prefix.";
|
|
4795
|
+
function getMulticodecPrefix(data) {
|
|
4796
|
+
if (data.length < 1) throw new TypeError(INVALID_MULTICODEC_PREFIX);
|
|
4797
|
+
let code = 0;
|
|
4798
|
+
let shift = 0;
|
|
4799
|
+
for (let i = 0; i < data.length; i++) {
|
|
4800
|
+
const byte = data[i];
|
|
4801
|
+
code += (byte & 127) * 2 ** shift;
|
|
4802
|
+
if (code > Number.MAX_SAFE_INTEGER) throw new TypeError(INVALID_MULTICODEC_PREFIX);
|
|
4803
|
+
if ((byte & 128) === 0) return {
|
|
4804
|
+
code,
|
|
4805
|
+
prefixLength: i + 1
|
|
4806
|
+
};
|
|
4807
|
+
shift += 7;
|
|
4808
|
+
if (shift >= 53) throw new TypeError(INVALID_MULTICODEC_PREFIX);
|
|
4809
|
+
}
|
|
4810
|
+
throw new TypeError(INVALID_MULTICODEC_PREFIX);
|
|
4811
|
+
}
|
|
4812
|
+
function removeMulticodecPrefix(data) {
|
|
4813
|
+
const { prefixLength } = getMulticodecPrefix(data);
|
|
4814
|
+
return data.slice(prefixLength);
|
|
4815
|
+
}
|
|
4816
|
+
function addMulticodecPrefix(code, payload) {
|
|
4817
|
+
if (!Number.isSafeInteger(code) || code < 0) throw new TypeError("Invalid multicodec code.");
|
|
4818
|
+
const prefix = [];
|
|
4819
|
+
let value = code;
|
|
4820
|
+
do {
|
|
4821
|
+
let byte = value & 127;
|
|
4822
|
+
value = Math.floor(value / 128);
|
|
4823
|
+
if (value > 0) byte |= 128;
|
|
4824
|
+
prefix.push(byte);
|
|
4825
|
+
} while (value > 0);
|
|
4826
|
+
const prefixed = new Uint8Array(prefix.length + payload.length);
|
|
4827
|
+
prefixed.set(prefix);
|
|
4828
|
+
prefixed.set(payload, prefix.length);
|
|
4829
|
+
return prefixed;
|
|
4830
|
+
}
|
|
4831
|
+
|
|
4813
4832
|
//#endregion
|
|
4814
4833
|
//#region src/jwk.ts
|
|
4815
4834
|
function validateCryptoKey(key, type) {
|
|
@@ -5226,8 +5245,8 @@ function importPem(pem) {
|
|
|
5226
5245
|
*/
|
|
5227
5246
|
async function importMultibaseKey(key) {
|
|
5228
5247
|
const decoded = decodeMultibase(key);
|
|
5229
|
-
const code = (
|
|
5230
|
-
const content = (
|
|
5248
|
+
const { code } = getMulticodecPrefix(decoded);
|
|
5249
|
+
const content = removeMulticodecPrefix(decoded);
|
|
5231
5250
|
if (code === 4613) {
|
|
5232
5251
|
const keyObject = (0, node_crypto.createPublicKey)({
|
|
5233
5252
|
key: content,
|
|
@@ -5276,9 +5295,7 @@ async function exportMultibaseKey(key) {
|
|
|
5276
5295
|
content = sequence.toBER(false);
|
|
5277
5296
|
code = 4613;
|
|
5278
5297
|
} else throw new TypeError("Unsupported key type: " + JSON.stringify(key.algorithm));
|
|
5279
|
-
const
|
|
5280
|
-
const codeBytes = (0, byte_encodings_hex.decodeHex)(codeHex.length % 2 < 1 ? codeHex : "0" + codeHex);
|
|
5281
|
-
const prefixed = (0, multicodec.addPrefix)(codeBytes, new Uint8Array(content));
|
|
5298
|
+
const prefixed = addMulticodecPrefix(code, new Uint8Array(content));
|
|
5282
5299
|
const encoded = encodeMultibase("base58btc", prefixed);
|
|
5283
5300
|
return new TextDecoder().decode(encoded);
|
|
5284
5301
|
}
|
package/dist/mod.js
CHANGED
|
@@ -6,8 +6,6 @@ import { isIP } from "node:net";
|
|
|
6
6
|
import { Integer, Sequence } from "asn1js";
|
|
7
7
|
import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
|
|
8
8
|
import { decodeBase64Url } from "byte-encodings/base64url";
|
|
9
|
-
import { decodeHex } from "byte-encodings/hex";
|
|
10
|
-
import { addPrefix, getCodeFromData, rmPrefix } from "multicodec";
|
|
11
9
|
import { createPublicKey } from "node:crypto";
|
|
12
10
|
import { PublicKeyInfo } from "pkijs";
|
|
13
11
|
import baseX from "@multiformats/base-x";
|
|
@@ -4264,9 +4262,12 @@ var contexts_default = preloadedContexts;
|
|
|
4264
4262
|
//#endregion
|
|
4265
4263
|
//#region deno.json
|
|
4266
4264
|
var name = "@fedify/vocab-runtime";
|
|
4267
|
-
var version = "2.0.
|
|
4265
|
+
var version = "2.0.7-dev.586+b3928d60";
|
|
4268
4266
|
var license = "MIT";
|
|
4269
|
-
var exports = {
|
|
4267
|
+
var exports = {
|
|
4268
|
+
".": "./src/mod.ts",
|
|
4269
|
+
"./jsonld": "./src/jsonld.ts"
|
|
4270
|
+
};
|
|
4270
4271
|
var description = "Runtime library for @fedify/vocab";
|
|
4271
4272
|
var author = {
|
|
4272
4273
|
"name": "Hong Minhee",
|
|
@@ -4278,7 +4279,7 @@ var imports = {
|
|
|
4278
4279
|
"asn1js": "npm:asn1js@^3.0.6",
|
|
4279
4280
|
"byte-encodings": "npm:byte-encodings@^1.0.11",
|
|
4280
4281
|
"fetch-mock": "npm:fetch-mock@^12.5.4",
|
|
4281
|
-
"
|
|
4282
|
+
"jsonld": "npm:jsonld@^9.0.0",
|
|
4282
4283
|
"pkijs": "npm:pkijs@^3.2.5"
|
|
4283
4284
|
};
|
|
4284
4285
|
var exclude = ["dist", "node_modules"];
|
|
@@ -4787,6 +4788,46 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
|
|
|
4787
4788
|
return load;
|
|
4788
4789
|
}
|
|
4789
4790
|
|
|
4791
|
+
//#endregion
|
|
4792
|
+
//#region src/internal/multicodec.ts
|
|
4793
|
+
const INVALID_MULTICODEC_PREFIX = "Invalid multicodec prefix.";
|
|
4794
|
+
function getMulticodecPrefix(data) {
|
|
4795
|
+
if (data.length < 1) throw new TypeError(INVALID_MULTICODEC_PREFIX);
|
|
4796
|
+
let code = 0;
|
|
4797
|
+
let shift = 0;
|
|
4798
|
+
for (let i = 0; i < data.length; i++) {
|
|
4799
|
+
const byte = data[i];
|
|
4800
|
+
code += (byte & 127) * 2 ** shift;
|
|
4801
|
+
if (code > Number.MAX_SAFE_INTEGER) throw new TypeError(INVALID_MULTICODEC_PREFIX);
|
|
4802
|
+
if ((byte & 128) === 0) return {
|
|
4803
|
+
code,
|
|
4804
|
+
prefixLength: i + 1
|
|
4805
|
+
};
|
|
4806
|
+
shift += 7;
|
|
4807
|
+
if (shift >= 53) throw new TypeError(INVALID_MULTICODEC_PREFIX);
|
|
4808
|
+
}
|
|
4809
|
+
throw new TypeError(INVALID_MULTICODEC_PREFIX);
|
|
4810
|
+
}
|
|
4811
|
+
function removeMulticodecPrefix(data) {
|
|
4812
|
+
const { prefixLength } = getMulticodecPrefix(data);
|
|
4813
|
+
return data.slice(prefixLength);
|
|
4814
|
+
}
|
|
4815
|
+
function addMulticodecPrefix(code, payload) {
|
|
4816
|
+
if (!Number.isSafeInteger(code) || code < 0) throw new TypeError("Invalid multicodec code.");
|
|
4817
|
+
const prefix = [];
|
|
4818
|
+
let value = code;
|
|
4819
|
+
do {
|
|
4820
|
+
let byte = value & 127;
|
|
4821
|
+
value = Math.floor(value / 128);
|
|
4822
|
+
if (value > 0) byte |= 128;
|
|
4823
|
+
prefix.push(byte);
|
|
4824
|
+
} while (value > 0);
|
|
4825
|
+
const prefixed = new Uint8Array(prefix.length + payload.length);
|
|
4826
|
+
prefixed.set(prefix);
|
|
4827
|
+
prefixed.set(payload, prefix.length);
|
|
4828
|
+
return prefixed;
|
|
4829
|
+
}
|
|
4830
|
+
|
|
4790
4831
|
//#endregion
|
|
4791
4832
|
//#region src/jwk.ts
|
|
4792
4833
|
function validateCryptoKey(key, type) {
|
|
@@ -5203,8 +5244,8 @@ function importPem(pem) {
|
|
|
5203
5244
|
*/
|
|
5204
5245
|
async function importMultibaseKey(key) {
|
|
5205
5246
|
const decoded = decodeMultibase(key);
|
|
5206
|
-
const code =
|
|
5207
|
-
const content =
|
|
5247
|
+
const { code } = getMulticodecPrefix(decoded);
|
|
5248
|
+
const content = removeMulticodecPrefix(decoded);
|
|
5208
5249
|
if (code === 4613) {
|
|
5209
5250
|
const keyObject = createPublicKey({
|
|
5210
5251
|
key: content,
|
|
@@ -5253,9 +5294,7 @@ async function exportMultibaseKey(key) {
|
|
|
5253
5294
|
content = sequence.toBER(false);
|
|
5254
5295
|
code = 4613;
|
|
5255
5296
|
} else throw new TypeError("Unsupported key type: " + JSON.stringify(key.algorithm));
|
|
5256
|
-
const
|
|
5257
|
-
const codeBytes = decodeHex(codeHex.length % 2 < 1 ? codeHex : "0" + codeHex);
|
|
5258
|
-
const prefixed = addPrefix(codeBytes, new Uint8Array(content));
|
|
5297
|
+
const prefixed = addMulticodecPrefix(code, new Uint8Array(content));
|
|
5259
5298
|
const encoded = encodeMultibase("base58btc", prefixed);
|
|
5260
5299
|
return new TextDecoder().decode(encoded);
|
|
5261
5300
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
const require_chunk = require('./chunk-DWy1uDak.cjs');
|
|
2
|
-
const require_request = require('./request-
|
|
2
|
+
const require_request = require('./request-DHjhMKWk.cjs');
|
|
3
3
|
const require_link = require('./link-CdFPEo9O.cjs');
|
|
4
4
|
const require_url = require('./url-C5Vs9nYh.cjs');
|
|
5
5
|
const node_assert = require_chunk.__toESM(require("node:assert"));
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { FetchError, createActivityPubRequest, deno_default, logRequest } from "./request-
|
|
1
|
+
import { FetchError, createActivityPubRequest, deno_default, logRequest } from "./request-CvrhEgps.js";
|
|
2
2
|
import { HttpHeaderLink } from "./link-Ck2yj4dH.js";
|
|
3
3
|
import { UrlError, validatePublicUrl } from "./url-fW_DHbih.js";
|
|
4
4
|
import "node:module";
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
const require_chunk = require('../chunk-DWy1uDak.cjs');
|
|
2
|
+
const require_multicodec = require('../multicodec-mHcRzSGY.cjs');
|
|
3
|
+
const node_assert = require_chunk.__toESM(require("node:assert"));
|
|
4
|
+
const node_test = require_chunk.__toESM(require("node:test"));
|
|
5
|
+
|
|
6
|
+
//#region src/internal/multicodec.test.ts
|
|
7
|
+
(0, node_test.test)("getMulticodecPrefix() decodes supported multicodec prefixes", () => {
|
|
8
|
+
(0, node_assert.deepStrictEqual)(require_multicodec.getMulticodecPrefix(Uint8Array.from([
|
|
9
|
+
237,
|
|
10
|
+
1,
|
|
11
|
+
170
|
|
12
|
+
])), {
|
|
13
|
+
code: 237,
|
|
14
|
+
prefixLength: 2
|
|
15
|
+
});
|
|
16
|
+
(0, node_assert.deepStrictEqual)(require_multicodec.getMulticodecPrefix(Uint8Array.from([
|
|
17
|
+
133,
|
|
18
|
+
36,
|
|
19
|
+
170
|
|
20
|
+
])), {
|
|
21
|
+
code: 4613,
|
|
22
|
+
prefixLength: 2
|
|
23
|
+
});
|
|
24
|
+
});
|
|
25
|
+
(0, node_test.test)("removeMulticodecPrefix() strips the varint prefix", () => {
|
|
26
|
+
(0, node_assert.deepStrictEqual)(require_multicodec.removeMulticodecPrefix(Uint8Array.from([
|
|
27
|
+
237,
|
|
28
|
+
1,
|
|
29
|
+
17,
|
|
30
|
+
34
|
|
31
|
+
])), Uint8Array.from([17, 34]));
|
|
32
|
+
});
|
|
33
|
+
(0, node_test.test)("addMulticodecPrefix() prepends the varint-encoded code", () => {
|
|
34
|
+
(0, node_assert.deepStrictEqual)(require_multicodec.addMulticodecPrefix(237, Uint8Array.from([17, 34])), Uint8Array.from([
|
|
35
|
+
237,
|
|
36
|
+
1,
|
|
37
|
+
17,
|
|
38
|
+
34
|
|
39
|
+
]));
|
|
40
|
+
(0, node_assert.deepStrictEqual)(require_multicodec.addMulticodecPrefix(4613, Uint8Array.from([17, 34])), Uint8Array.from([
|
|
41
|
+
133,
|
|
42
|
+
36,
|
|
43
|
+
17,
|
|
44
|
+
34
|
|
45
|
+
]));
|
|
46
|
+
});
|
|
47
|
+
(0, node_test.test)("multicodec helpers round-trip prefixed payloads", () => {
|
|
48
|
+
const payload = Uint8Array.from([
|
|
49
|
+
222,
|
|
50
|
+
173,
|
|
51
|
+
190,
|
|
52
|
+
239
|
|
53
|
+
]);
|
|
54
|
+
const prefixed = require_multicodec.addMulticodecPrefix(4613, payload);
|
|
55
|
+
(0, node_assert.deepStrictEqual)(require_multicodec.getMulticodecPrefix(prefixed), {
|
|
56
|
+
code: 4613,
|
|
57
|
+
prefixLength: 2
|
|
58
|
+
});
|
|
59
|
+
(0, node_assert.deepStrictEqual)(require_multicodec.removeMulticodecPrefix(prefixed), payload);
|
|
60
|
+
});
|
|
61
|
+
(0, node_test.test)("multicodec helpers reject malformed prefixes", () => {
|
|
62
|
+
(0, node_assert.throws)(() => require_multicodec.getMulticodecPrefix(new Uint8Array([])), /* @__PURE__ */ new TypeError("Invalid multicodec prefix."));
|
|
63
|
+
(0, node_assert.throws)(() => require_multicodec.getMulticodecPrefix(Uint8Array.from([128])), /* @__PURE__ */ new TypeError("Invalid multicodec prefix."));
|
|
64
|
+
(0, node_assert.throws)(() => require_multicodec.getMulticodecPrefix(Uint8Array.from([
|
|
65
|
+
128,
|
|
66
|
+
128,
|
|
67
|
+
128,
|
|
68
|
+
128,
|
|
69
|
+
128,
|
|
70
|
+
128,
|
|
71
|
+
128,
|
|
72
|
+
128
|
|
73
|
+
])), /* @__PURE__ */ new TypeError("Invalid multicodec prefix."));
|
|
74
|
+
(0, node_assert.throws)(() => require_multicodec.addMulticodecPrefix(-1, Uint8Array.from([0])), /* @__PURE__ */ new TypeError("Invalid multicodec code."));
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
//#endregion
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
import { addMulticodecPrefix, getMulticodecPrefix, removeMulticodecPrefix } from "../multicodec-DvC5xnX2.js";
|
|
2
|
+
import { deepStrictEqual, throws } from "node:assert";
|
|
3
|
+
import { test } from "node:test";
|
|
4
|
+
|
|
5
|
+
//#region src/internal/multicodec.test.ts
|
|
6
|
+
test("getMulticodecPrefix() decodes supported multicodec prefixes", () => {
|
|
7
|
+
deepStrictEqual(getMulticodecPrefix(Uint8Array.from([
|
|
8
|
+
237,
|
|
9
|
+
1,
|
|
10
|
+
170
|
|
11
|
+
])), {
|
|
12
|
+
code: 237,
|
|
13
|
+
prefixLength: 2
|
|
14
|
+
});
|
|
15
|
+
deepStrictEqual(getMulticodecPrefix(Uint8Array.from([
|
|
16
|
+
133,
|
|
17
|
+
36,
|
|
18
|
+
170
|
|
19
|
+
])), {
|
|
20
|
+
code: 4613,
|
|
21
|
+
prefixLength: 2
|
|
22
|
+
});
|
|
23
|
+
});
|
|
24
|
+
test("removeMulticodecPrefix() strips the varint prefix", () => {
|
|
25
|
+
deepStrictEqual(removeMulticodecPrefix(Uint8Array.from([
|
|
26
|
+
237,
|
|
27
|
+
1,
|
|
28
|
+
17,
|
|
29
|
+
34
|
|
30
|
+
])), Uint8Array.from([17, 34]));
|
|
31
|
+
});
|
|
32
|
+
test("addMulticodecPrefix() prepends the varint-encoded code", () => {
|
|
33
|
+
deepStrictEqual(addMulticodecPrefix(237, Uint8Array.from([17, 34])), Uint8Array.from([
|
|
34
|
+
237,
|
|
35
|
+
1,
|
|
36
|
+
17,
|
|
37
|
+
34
|
|
38
|
+
]));
|
|
39
|
+
deepStrictEqual(addMulticodecPrefix(4613, Uint8Array.from([17, 34])), Uint8Array.from([
|
|
40
|
+
133,
|
|
41
|
+
36,
|
|
42
|
+
17,
|
|
43
|
+
34
|
|
44
|
+
]));
|
|
45
|
+
});
|
|
46
|
+
test("multicodec helpers round-trip prefixed payloads", () => {
|
|
47
|
+
const payload = Uint8Array.from([
|
|
48
|
+
222,
|
|
49
|
+
173,
|
|
50
|
+
190,
|
|
51
|
+
239
|
|
52
|
+
]);
|
|
53
|
+
const prefixed = addMulticodecPrefix(4613, payload);
|
|
54
|
+
deepStrictEqual(getMulticodecPrefix(prefixed), {
|
|
55
|
+
code: 4613,
|
|
56
|
+
prefixLength: 2
|
|
57
|
+
});
|
|
58
|
+
deepStrictEqual(removeMulticodecPrefix(prefixed), payload);
|
|
59
|
+
});
|
|
60
|
+
test("multicodec helpers reject malformed prefixes", () => {
|
|
61
|
+
throws(() => getMulticodecPrefix(new Uint8Array([])), /* @__PURE__ */ new TypeError("Invalid multicodec prefix."));
|
|
62
|
+
throws(() => getMulticodecPrefix(Uint8Array.from([128])), /* @__PURE__ */ new TypeError("Invalid multicodec prefix."));
|
|
63
|
+
throws(() => getMulticodecPrefix(Uint8Array.from([
|
|
64
|
+
128,
|
|
65
|
+
128,
|
|
66
|
+
128,
|
|
67
|
+
128,
|
|
68
|
+
128,
|
|
69
|
+
128,
|
|
70
|
+
128,
|
|
71
|
+
128
|
|
72
|
+
])), /* @__PURE__ */ new TypeError("Invalid multicodec prefix."));
|
|
73
|
+
throws(() => addMulticodecPrefix(-1, Uint8Array.from([0])), /* @__PURE__ */ new TypeError("Invalid multicodec code."));
|
|
74
|
+
});
|
|
75
|
+
|
|
76
|
+
//#endregion
|
package/dist/tests/key.test.cjs
CHANGED
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
const require_chunk = require('./chunk-DWy1uDak.cjs');
|
|
2
|
-
const
|
|
2
|
+
const require_multicodec = require('./multicodec-mHcRzSGY.cjs');
|
|
3
|
+
const require_multibase = require('./multibase-B2D6B0V4.cjs');
|
|
3
4
|
const node_assert = require_chunk.__toESM(require("node:assert"));
|
|
4
5
|
const node_test = require_chunk.__toESM(require("node:test"));
|
|
5
6
|
const asn1js = require_chunk.__toESM(require("asn1js"));
|
|
6
7
|
const byte_encodings_base64 = require_chunk.__toESM(require("byte-encodings/base64"));
|
|
7
8
|
const byte_encodings_base64url = require_chunk.__toESM(require("byte-encodings/base64url"));
|
|
8
|
-
const byte_encodings_hex = require_chunk.__toESM(require("byte-encodings/hex"));
|
|
9
|
-
const multicodec = require_chunk.__toESM(require("multicodec"));
|
|
10
9
|
const node_crypto = require_chunk.__toESM(require("node:crypto"));
|
|
11
10
|
const pkijs = require_chunk.__toESM(require("pkijs"));
|
|
12
11
|
|
|
@@ -128,8 +127,8 @@ function importPem(pem) {
|
|
|
128
127
|
*/
|
|
129
128
|
async function importMultibaseKey(key) {
|
|
130
129
|
const decoded = require_multibase.decodeMultibase(key);
|
|
131
|
-
const code =
|
|
132
|
-
const content =
|
|
130
|
+
const { code } = require_multicodec.getMulticodecPrefix(decoded);
|
|
131
|
+
const content = require_multicodec.removeMulticodecPrefix(decoded);
|
|
133
132
|
if (code === 4613) {
|
|
134
133
|
const keyObject = (0, node_crypto.createPublicKey)({
|
|
135
134
|
key: content,
|
|
@@ -178,9 +177,7 @@ async function exportMultibaseKey(key) {
|
|
|
178
177
|
content = sequence.toBER(false);
|
|
179
178
|
code = 4613;
|
|
180
179
|
} else throw new TypeError("Unsupported key type: " + JSON.stringify(key.algorithm));
|
|
181
|
-
const
|
|
182
|
-
const codeBytes = (0, byte_encodings_hex.decodeHex)(codeHex.length % 2 < 1 ? codeHex : "0" + codeHex);
|
|
183
|
-
const prefixed = (0, multicodec.addPrefix)(codeBytes, new Uint8Array(content));
|
|
180
|
+
const prefixed = require_multicodec.addMulticodecPrefix(code, new Uint8Array(content));
|
|
184
181
|
const encoded = require_multibase.encodeMultibase("base58btc", prefixed);
|
|
185
182
|
return new TextDecoder().decode(encoded);
|
|
186
183
|
}
|
|
@@ -240,6 +237,11 @@ const ed25519Multibase = "z6MksHj1MJnidCtDiyYW9ugNFftoX9fLK4bornTxmMZ6X7vq";
|
|
|
240
237
|
const ed25519Key = await importMultibaseKey(ed25519Multibase);
|
|
241
238
|
(0, node_assert.deepStrictEqual)(await exportJwk(ed25519Key), ed25519Jwk);
|
|
242
239
|
});
|
|
240
|
+
(0, node_test.test)("importMultibase() rejects malformed multicodec prefixes", async () => {
|
|
241
|
+
const decoder = new TextDecoder();
|
|
242
|
+
await (0, node_assert.rejects)(() => importMultibaseKey(decoder.decode(require_multibase.encodeMultibase("base58btc", new Uint8Array([])))), /* @__PURE__ */ new TypeError("Invalid multicodec prefix."));
|
|
243
|
+
await (0, node_assert.rejects)(() => importMultibaseKey(decoder.decode(require_multibase.encodeMultibase("base58btc", Uint8Array.from([128])))), /* @__PURE__ */ new TypeError("Invalid multicodec prefix."));
|
|
244
|
+
});
|
|
243
245
|
(0, node_test.test)("exportMultibaseKey()", async () => {
|
|
244
246
|
const rsaKey = await importJwk(rsaJwk, "public");
|
|
245
247
|
const rsaMb = await exportMultibaseKey(rsaKey);
|
package/dist/tests/key.test.js
CHANGED
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { addMulticodecPrefix, getMulticodecPrefix, removeMulticodecPrefix } from "./multicodec-DvC5xnX2.js";
|
|
2
|
+
import { decodeMultibase, encodeMultibase } from "./multibase-BdHCGO4H.js";
|
|
3
|
+
import { deepStrictEqual, rejects } from "node:assert";
|
|
3
4
|
import { test } from "node:test";
|
|
4
5
|
import { Integer, Sequence } from "asn1js";
|
|
5
6
|
import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
|
|
6
7
|
import { decodeBase64Url } from "byte-encodings/base64url";
|
|
7
|
-
import { decodeHex } from "byte-encodings/hex";
|
|
8
|
-
import { addPrefix, getCodeFromData, rmPrefix } from "multicodec";
|
|
9
8
|
import { createPublicKey } from "node:crypto";
|
|
10
9
|
import { PublicKeyInfo } from "pkijs";
|
|
11
10
|
|
|
@@ -127,8 +126,8 @@ function importPem(pem) {
|
|
|
127
126
|
*/
|
|
128
127
|
async function importMultibaseKey(key) {
|
|
129
128
|
const decoded = decodeMultibase(key);
|
|
130
|
-
const code =
|
|
131
|
-
const content =
|
|
129
|
+
const { code } = getMulticodecPrefix(decoded);
|
|
130
|
+
const content = removeMulticodecPrefix(decoded);
|
|
132
131
|
if (code === 4613) {
|
|
133
132
|
const keyObject = createPublicKey({
|
|
134
133
|
key: content,
|
|
@@ -177,9 +176,7 @@ async function exportMultibaseKey(key) {
|
|
|
177
176
|
content = sequence.toBER(false);
|
|
178
177
|
code = 4613;
|
|
179
178
|
} else throw new TypeError("Unsupported key type: " + JSON.stringify(key.algorithm));
|
|
180
|
-
const
|
|
181
|
-
const codeBytes = decodeHex(codeHex.length % 2 < 1 ? codeHex : "0" + codeHex);
|
|
182
|
-
const prefixed = addPrefix(codeBytes, new Uint8Array(content));
|
|
179
|
+
const prefixed = addMulticodecPrefix(code, new Uint8Array(content));
|
|
183
180
|
const encoded = encodeMultibase("base58btc", prefixed);
|
|
184
181
|
return new TextDecoder().decode(encoded);
|
|
185
182
|
}
|
|
@@ -239,6 +236,11 @@ test("importMultibase()", async () => {
|
|
|
239
236
|
const ed25519Key = await importMultibaseKey(ed25519Multibase);
|
|
240
237
|
deepStrictEqual(await exportJwk(ed25519Key), ed25519Jwk);
|
|
241
238
|
});
|
|
239
|
+
test("importMultibase() rejects malformed multicodec prefixes", async () => {
|
|
240
|
+
const decoder = new TextDecoder();
|
|
241
|
+
await rejects(() => importMultibaseKey(decoder.decode(encodeMultibase("base58btc", new Uint8Array([])))), /* @__PURE__ */ new TypeError("Invalid multicodec prefix."));
|
|
242
|
+
await rejects(() => importMultibaseKey(decoder.decode(encodeMultibase("base58btc", Uint8Array.from([128])))), /* @__PURE__ */ new TypeError("Invalid multicodec prefix."));
|
|
243
|
+
});
|
|
242
244
|
test("exportMultibaseKey()", async () => {
|
|
243
245
|
const rsaKey = await importJwk(rsaJwk, "public");
|
|
244
246
|
const rsaMb = await exportMultibaseKey(rsaKey);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
const require_chunk = require('../chunk-DWy1uDak.cjs');
|
|
2
|
-
const require_multibase = require('../multibase-
|
|
2
|
+
const require_multibase = require('../multibase-B2D6B0V4.cjs');
|
|
3
3
|
const node_assert = require_chunk.__toESM(require("node:assert"));
|
|
4
4
|
const node_test = require_chunk.__toESM(require("node:test"));
|
|
5
5
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { codes, decodeMultibase, decodeText, encodeMultibase, encodeText, names } from "../multibase-
|
|
1
|
+
import { codes, decodeMultibase, decodeText, encodeMultibase, encodeText, names } from "../multibase-BdHCGO4H.js";
|
|
2
2
|
import { deepStrictEqual } from "node:assert";
|
|
3
3
|
import { test } from "node:test";
|
|
4
4
|
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
//#region src/internal/multicodec.ts
|
|
2
|
+
const INVALID_MULTICODEC_PREFIX = "Invalid multicodec prefix.";
|
|
3
|
+
function getMulticodecPrefix(data) {
|
|
4
|
+
if (data.length < 1) throw new TypeError(INVALID_MULTICODEC_PREFIX);
|
|
5
|
+
let code = 0;
|
|
6
|
+
let shift = 0;
|
|
7
|
+
for (let i = 0; i < data.length; i++) {
|
|
8
|
+
const byte = data[i];
|
|
9
|
+
code += (byte & 127) * 2 ** shift;
|
|
10
|
+
if (code > Number.MAX_SAFE_INTEGER) throw new TypeError(INVALID_MULTICODEC_PREFIX);
|
|
11
|
+
if ((byte & 128) === 0) return {
|
|
12
|
+
code,
|
|
13
|
+
prefixLength: i + 1
|
|
14
|
+
};
|
|
15
|
+
shift += 7;
|
|
16
|
+
if (shift >= 53) throw new TypeError(INVALID_MULTICODEC_PREFIX);
|
|
17
|
+
}
|
|
18
|
+
throw new TypeError(INVALID_MULTICODEC_PREFIX);
|
|
19
|
+
}
|
|
20
|
+
function removeMulticodecPrefix(data) {
|
|
21
|
+
const { prefixLength } = getMulticodecPrefix(data);
|
|
22
|
+
return data.slice(prefixLength);
|
|
23
|
+
}
|
|
24
|
+
function addMulticodecPrefix(code, payload) {
|
|
25
|
+
if (!Number.isSafeInteger(code) || code < 0) throw new TypeError("Invalid multicodec code.");
|
|
26
|
+
const prefix = [];
|
|
27
|
+
let value = code;
|
|
28
|
+
do {
|
|
29
|
+
let byte = value & 127;
|
|
30
|
+
value = Math.floor(value / 128);
|
|
31
|
+
if (value > 0) byte |= 128;
|
|
32
|
+
prefix.push(byte);
|
|
33
|
+
} while (value > 0);
|
|
34
|
+
const prefixed = new Uint8Array(prefix.length + payload.length);
|
|
35
|
+
prefixed.set(prefix);
|
|
36
|
+
prefixed.set(payload, prefix.length);
|
|
37
|
+
return prefixed;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
//#endregion
|
|
41
|
+
export { addMulticodecPrefix, getMulticodecPrefix, removeMulticodecPrefix };
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
|
|
2
|
+
//#region src/internal/multicodec.ts
|
|
3
|
+
const INVALID_MULTICODEC_PREFIX = "Invalid multicodec prefix.";
|
|
4
|
+
function getMulticodecPrefix(data) {
|
|
5
|
+
if (data.length < 1) throw new TypeError(INVALID_MULTICODEC_PREFIX);
|
|
6
|
+
let code = 0;
|
|
7
|
+
let shift = 0;
|
|
8
|
+
for (let i = 0; i < data.length; i++) {
|
|
9
|
+
const byte = data[i];
|
|
10
|
+
code += (byte & 127) * 2 ** shift;
|
|
11
|
+
if (code > Number.MAX_SAFE_INTEGER) throw new TypeError(INVALID_MULTICODEC_PREFIX);
|
|
12
|
+
if ((byte & 128) === 0) return {
|
|
13
|
+
code,
|
|
14
|
+
prefixLength: i + 1
|
|
15
|
+
};
|
|
16
|
+
shift += 7;
|
|
17
|
+
if (shift >= 53) throw new TypeError(INVALID_MULTICODEC_PREFIX);
|
|
18
|
+
}
|
|
19
|
+
throw new TypeError(INVALID_MULTICODEC_PREFIX);
|
|
20
|
+
}
|
|
21
|
+
function removeMulticodecPrefix(data) {
|
|
22
|
+
const { prefixLength } = getMulticodecPrefix(data);
|
|
23
|
+
return data.slice(prefixLength);
|
|
24
|
+
}
|
|
25
|
+
function addMulticodecPrefix(code, payload) {
|
|
26
|
+
if (!Number.isSafeInteger(code) || code < 0) throw new TypeError("Invalid multicodec code.");
|
|
27
|
+
const prefix = [];
|
|
28
|
+
let value = code;
|
|
29
|
+
do {
|
|
30
|
+
let byte = value & 127;
|
|
31
|
+
value = Math.floor(value / 128);
|
|
32
|
+
if (value > 0) byte |= 128;
|
|
33
|
+
prefix.push(byte);
|
|
34
|
+
} while (value > 0);
|
|
35
|
+
const prefixed = new Uint8Array(prefix.length + payload.length);
|
|
36
|
+
prefixed.set(prefix);
|
|
37
|
+
prefixed.set(payload, prefix.length);
|
|
38
|
+
return prefixed;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
//#endregion
|
|
42
|
+
Object.defineProperty(exports, 'addMulticodecPrefix', {
|
|
43
|
+
enumerable: true,
|
|
44
|
+
get: function () {
|
|
45
|
+
return addMulticodecPrefix;
|
|
46
|
+
}
|
|
47
|
+
});
|
|
48
|
+
Object.defineProperty(exports, 'getMulticodecPrefix', {
|
|
49
|
+
enumerable: true,
|
|
50
|
+
get: function () {
|
|
51
|
+
return getMulticodecPrefix;
|
|
52
|
+
}
|
|
53
|
+
});
|
|
54
|
+
Object.defineProperty(exports, 'removeMulticodecPrefix', {
|
|
55
|
+
enumerable: true,
|
|
56
|
+
get: function () {
|
|
57
|
+
return removeMulticodecPrefix;
|
|
58
|
+
}
|
|
59
|
+
});
|
|
@@ -2,9 +2,12 @@ import process from "node:process";
|
|
|
2
2
|
|
|
3
3
|
//#region deno.json
|
|
4
4
|
var name = "@fedify/vocab-runtime";
|
|
5
|
-
var version = "2.0.
|
|
5
|
+
var version = "2.0.7-dev.586+b3928d60";
|
|
6
6
|
var license = "MIT";
|
|
7
|
-
var exports = {
|
|
7
|
+
var exports = {
|
|
8
|
+
".": "./src/mod.ts",
|
|
9
|
+
"./jsonld": "./src/jsonld.ts"
|
|
10
|
+
};
|
|
8
11
|
var description = "Runtime library for @fedify/vocab";
|
|
9
12
|
var author = {
|
|
10
13
|
"name": "Hong Minhee",
|
|
@@ -16,7 +19,7 @@ var imports = {
|
|
|
16
19
|
"asn1js": "npm:asn1js@^3.0.6",
|
|
17
20
|
"byte-encodings": "npm:byte-encodings@^1.0.11",
|
|
18
21
|
"fetch-mock": "npm:fetch-mock@^12.5.4",
|
|
19
|
-
"
|
|
22
|
+
"jsonld": "npm:jsonld@^9.0.0",
|
|
20
23
|
"pkijs": "npm:pkijs@^3.2.5"
|
|
21
24
|
};
|
|
22
25
|
var exclude = ["dist", "node_modules"];
|
|
@@ -3,9 +3,12 @@ const node_process = require_chunk.__toESM(require("node:process"));
|
|
|
3
3
|
|
|
4
4
|
//#region deno.json
|
|
5
5
|
var name = "@fedify/vocab-runtime";
|
|
6
|
-
var version = "2.0.
|
|
6
|
+
var version = "2.0.7-dev.586+b3928d60";
|
|
7
7
|
var license = "MIT";
|
|
8
|
-
var exports$1 = {
|
|
8
|
+
var exports$1 = {
|
|
9
|
+
".": "./src/mod.ts",
|
|
10
|
+
"./jsonld": "./src/jsonld.ts"
|
|
11
|
+
};
|
|
9
12
|
var description = "Runtime library for @fedify/vocab";
|
|
10
13
|
var author = {
|
|
11
14
|
"name": "Hong Minhee",
|
|
@@ -17,7 +20,7 @@ var imports = {
|
|
|
17
20
|
"asn1js": "npm:asn1js@^3.0.6",
|
|
18
21
|
"byte-encodings": "npm:byte-encodings@^1.0.11",
|
|
19
22
|
"fetch-mock": "npm:fetch-mock@^12.5.4",
|
|
20
|
-
"
|
|
23
|
+
"jsonld": "npm:jsonld@^9.0.0",
|
|
21
24
|
"pkijs": "npm:pkijs@^3.2.5"
|
|
22
25
|
};
|
|
23
26
|
var exclude = ["dist", "node_modules"];
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
const require_chunk = require('./chunk-DWy1uDak.cjs');
|
|
2
|
-
const require_request = require('./request-
|
|
2
|
+
const require_request = require('./request-DHjhMKWk.cjs');
|
|
3
3
|
const node_assert = require_chunk.__toESM(require("node:assert"));
|
|
4
4
|
const node_test = require_chunk.__toESM(require("node:test"));
|
|
5
5
|
const node_process = require_chunk.__toESM(require("node:process"));
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fedify/vocab-runtime",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.7-dev.586+b3928d60",
|
|
4
4
|
"homepage": "https://fedify.dev/",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -35,6 +35,16 @@
|
|
|
35
35
|
"require": "./dist/mod.cjs",
|
|
36
36
|
"default": "./dist/mod.js"
|
|
37
37
|
},
|
|
38
|
+
"./jsonld": {
|
|
39
|
+
"types": {
|
|
40
|
+
"import": "./dist/jsonld.d.ts",
|
|
41
|
+
"require": "./dist/jsonld.d.cts",
|
|
42
|
+
"default": "./dist/jsonld.d.ts"
|
|
43
|
+
},
|
|
44
|
+
"import": "./dist/jsonld.js",
|
|
45
|
+
"require": "./dist/jsonld.cjs",
|
|
46
|
+
"default": "./dist/jsonld.js"
|
|
47
|
+
},
|
|
38
48
|
"./package.json": "./package.json"
|
|
39
49
|
},
|
|
40
50
|
"keywords": [
|
|
@@ -60,7 +70,7 @@
|
|
|
60
70
|
"@opentelemetry/api": "^1.9.0",
|
|
61
71
|
"asn1js": "^3.0.6",
|
|
62
72
|
"byte-encodings": "^1.0.11",
|
|
63
|
-
"
|
|
73
|
+
"jsonld": "^9.0.0",
|
|
64
74
|
"pkijs": "^3.3.3"
|
|
65
75
|
},
|
|
66
76
|
"scripts": {
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
import { deepStrictEqual, throws } from "node:assert";
|
|
2
|
+
import { test } from "node:test";
|
|
3
|
+
import {
|
|
4
|
+
addMulticodecPrefix,
|
|
5
|
+
getMulticodecPrefix,
|
|
6
|
+
removeMulticodecPrefix,
|
|
7
|
+
} from "./multicodec.ts";
|
|
8
|
+
|
|
9
|
+
test("getMulticodecPrefix() decodes supported multicodec prefixes", () => {
|
|
10
|
+
deepStrictEqual(
|
|
11
|
+
getMulticodecPrefix(Uint8Array.from([0xed, 0x01, 0xaa])),
|
|
12
|
+
{ code: 0xed, prefixLength: 2 },
|
|
13
|
+
);
|
|
14
|
+
deepStrictEqual(
|
|
15
|
+
getMulticodecPrefix(Uint8Array.from([0x85, 0x24, 0xaa])),
|
|
16
|
+
{ code: 0x1205, prefixLength: 2 },
|
|
17
|
+
);
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
test("removeMulticodecPrefix() strips the varint prefix", () => {
|
|
21
|
+
deepStrictEqual(
|
|
22
|
+
removeMulticodecPrefix(Uint8Array.from([0xed, 0x01, 0x11, 0x22])),
|
|
23
|
+
Uint8Array.from([0x11, 0x22]),
|
|
24
|
+
);
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
test("addMulticodecPrefix() prepends the varint-encoded code", () => {
|
|
28
|
+
deepStrictEqual(
|
|
29
|
+
addMulticodecPrefix(0xed, Uint8Array.from([0x11, 0x22])),
|
|
30
|
+
Uint8Array.from([0xed, 0x01, 0x11, 0x22]),
|
|
31
|
+
);
|
|
32
|
+
deepStrictEqual(
|
|
33
|
+
addMulticodecPrefix(0x1205, Uint8Array.from([0x11, 0x22])),
|
|
34
|
+
Uint8Array.from([0x85, 0x24, 0x11, 0x22]),
|
|
35
|
+
);
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
test("multicodec helpers round-trip prefixed payloads", () => {
|
|
39
|
+
const payload = Uint8Array.from([0xde, 0xad, 0xbe, 0xef]);
|
|
40
|
+
const prefixed = addMulticodecPrefix(0x1205, payload);
|
|
41
|
+
deepStrictEqual(getMulticodecPrefix(prefixed), {
|
|
42
|
+
code: 0x1205,
|
|
43
|
+
prefixLength: 2,
|
|
44
|
+
});
|
|
45
|
+
deepStrictEqual(removeMulticodecPrefix(prefixed), payload);
|
|
46
|
+
});
|
|
47
|
+
|
|
48
|
+
test("multicodec helpers reject malformed prefixes", () => {
|
|
49
|
+
throws(
|
|
50
|
+
() => getMulticodecPrefix(new Uint8Array([])),
|
|
51
|
+
new TypeError("Invalid multicodec prefix."),
|
|
52
|
+
);
|
|
53
|
+
throws(
|
|
54
|
+
() => getMulticodecPrefix(Uint8Array.from([0x80])),
|
|
55
|
+
new TypeError("Invalid multicodec prefix."),
|
|
56
|
+
);
|
|
57
|
+
throws(
|
|
58
|
+
() =>
|
|
59
|
+
getMulticodecPrefix(
|
|
60
|
+
Uint8Array.from([0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80]),
|
|
61
|
+
),
|
|
62
|
+
new TypeError("Invalid multicodec prefix."),
|
|
63
|
+
);
|
|
64
|
+
throws(
|
|
65
|
+
() => addMulticodecPrefix(-1, Uint8Array.from([0x00])),
|
|
66
|
+
new TypeError("Invalid multicodec code."),
|
|
67
|
+
);
|
|
68
|
+
});
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
const INVALID_MULTICODEC_PREFIX = "Invalid multicodec prefix.";
|
|
2
|
+
|
|
3
|
+
export interface MulticodecPrefix {
|
|
4
|
+
code: number;
|
|
5
|
+
prefixLength: number;
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
export function getMulticodecPrefix(
|
|
9
|
+
data: Uint8Array,
|
|
10
|
+
): MulticodecPrefix {
|
|
11
|
+
if (data.length < 1) throw new TypeError(INVALID_MULTICODEC_PREFIX);
|
|
12
|
+
let code = 0;
|
|
13
|
+
let shift = 0;
|
|
14
|
+
for (let i = 0; i < data.length; i++) {
|
|
15
|
+
const byte = data[i];
|
|
16
|
+
code += (byte & 0x7f) * 2 ** shift;
|
|
17
|
+
if (code > Number.MAX_SAFE_INTEGER) {
|
|
18
|
+
throw new TypeError(INVALID_MULTICODEC_PREFIX);
|
|
19
|
+
}
|
|
20
|
+
if ((byte & 0x80) === 0) {
|
|
21
|
+
return { code, prefixLength: i + 1 };
|
|
22
|
+
}
|
|
23
|
+
shift += 7;
|
|
24
|
+
if (shift >= 53) throw new TypeError(INVALID_MULTICODEC_PREFIX);
|
|
25
|
+
}
|
|
26
|
+
throw new TypeError(INVALID_MULTICODEC_PREFIX);
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
export function removeMulticodecPrefix(data: Uint8Array): Uint8Array {
|
|
30
|
+
const { prefixLength } = getMulticodecPrefix(data);
|
|
31
|
+
return data.slice(prefixLength);
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
export function addMulticodecPrefix(
|
|
35
|
+
code: number,
|
|
36
|
+
payload: Uint8Array,
|
|
37
|
+
): Uint8Array {
|
|
38
|
+
if (!Number.isSafeInteger(code) || code < 0) {
|
|
39
|
+
throw new TypeError("Invalid multicodec code.");
|
|
40
|
+
}
|
|
41
|
+
const prefix: number[] = [];
|
|
42
|
+
let value = code;
|
|
43
|
+
do {
|
|
44
|
+
let byte = value & 0x7f;
|
|
45
|
+
value = Math.floor(value / 0x80);
|
|
46
|
+
if (value > 0) byte |= 0x80;
|
|
47
|
+
prefix.push(byte);
|
|
48
|
+
} while (value > 0);
|
|
49
|
+
const prefixed = new Uint8Array(prefix.length + payload.length);
|
|
50
|
+
prefixed.set(prefix);
|
|
51
|
+
prefixed.set(payload, prefix.length);
|
|
52
|
+
return prefixed;
|
|
53
|
+
}
|
package/src/jsonld.ts
ADDED
package/src/key.test.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { deepStrictEqual } from "node:assert";
|
|
1
|
+
import { deepStrictEqual, rejects } from "node:assert";
|
|
2
2
|
import { test } from "node:test";
|
|
3
3
|
import { exportJwk, importJwk } from "./jwk.ts";
|
|
4
4
|
import {
|
|
@@ -9,6 +9,7 @@ import {
|
|
|
9
9
|
importPkcs1,
|
|
10
10
|
importSpki,
|
|
11
11
|
} from "./key.ts";
|
|
12
|
+
import { encodeMultibase } from "./multibase/mod.ts";
|
|
12
13
|
|
|
13
14
|
// cSpell: disable
|
|
14
15
|
const rsaSpki = "-----BEGIN PUBLIC KEY-----\n" +
|
|
@@ -122,6 +123,26 @@ test("importMultibase()", async () => {
|
|
|
122
123
|
deepStrictEqual(await exportJwk(ed25519Key), ed25519Jwk);
|
|
123
124
|
});
|
|
124
125
|
|
|
126
|
+
test("importMultibase() rejects malformed multicodec prefixes", async () => {
|
|
127
|
+
const decoder = new TextDecoder();
|
|
128
|
+
await rejects(
|
|
129
|
+
() =>
|
|
130
|
+
importMultibaseKey(
|
|
131
|
+
decoder.decode(encodeMultibase("base58btc", new Uint8Array([]))),
|
|
132
|
+
),
|
|
133
|
+
new TypeError("Invalid multicodec prefix."),
|
|
134
|
+
);
|
|
135
|
+
await rejects(
|
|
136
|
+
() =>
|
|
137
|
+
importMultibaseKey(
|
|
138
|
+
decoder.decode(
|
|
139
|
+
encodeMultibase("base58btc", Uint8Array.from([0x80])),
|
|
140
|
+
),
|
|
141
|
+
),
|
|
142
|
+
new TypeError("Invalid multicodec prefix."),
|
|
143
|
+
);
|
|
144
|
+
});
|
|
145
|
+
|
|
125
146
|
test("exportMultibaseKey()", async () => {
|
|
126
147
|
const rsaKey = await importJwk(rsaJwk, "public");
|
|
127
148
|
const rsaMb = await exportMultibaseKey(rsaKey);
|
package/src/key.ts
CHANGED
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
import { Integer, Sequence } from "asn1js";
|
|
2
2
|
import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
|
|
3
3
|
import { decodeBase64Url } from "byte-encodings/base64url";
|
|
4
|
-
import { decodeHex } from "byte-encodings/hex";
|
|
5
|
-
import { addPrefix, getCodeFromData, rmPrefix } from "multicodec";
|
|
6
4
|
import { createPublicKey } from "node:crypto";
|
|
7
5
|
import { PublicKeyInfo } from "pkijs";
|
|
6
|
+
import {
|
|
7
|
+
addMulticodecPrefix,
|
|
8
|
+
getMulticodecPrefix,
|
|
9
|
+
removeMulticodecPrefix,
|
|
10
|
+
} from "./internal/multicodec.ts";
|
|
8
11
|
import { validateCryptoKey } from "./jwk.ts";
|
|
9
12
|
import { decodeMultibase, encodeMultibase } from "./multibase/mod.ts";
|
|
10
13
|
|
|
@@ -101,8 +104,8 @@ export function importPem(pem: string): Promise<CryptoKey> {
|
|
|
101
104
|
*/
|
|
102
105
|
export async function importMultibaseKey(key: string): Promise<CryptoKey> {
|
|
103
106
|
const decoded = decodeMultibase(key);
|
|
104
|
-
const code
|
|
105
|
-
const content =
|
|
107
|
+
const { code } = getMulticodecPrefix(decoded);
|
|
108
|
+
const content = removeMulticodecPrefix(decoded);
|
|
106
109
|
if (code === 0x1205) { // rsa-pub
|
|
107
110
|
const keyObject = createPublicKey({
|
|
108
111
|
// deno-lint-ignore no-explicit-any
|
|
@@ -177,11 +180,9 @@ export async function exportMultibaseKey(key: CryptoKey): Promise<string> {
|
|
|
177
180
|
"Unsupported key type: " + JSON.stringify(key.algorithm),
|
|
178
181
|
);
|
|
179
182
|
}
|
|
180
|
-
const
|
|
181
|
-
const codeBytes = decodeHex(codeHex.length % 2 < 1 ? codeHex : "0" + codeHex);
|
|
182
|
-
const prefixed = addPrefix(codeBytes, new Uint8Array(content));
|
|
183
|
+
const prefixed = addMulticodecPrefix(code, new Uint8Array(content));
|
|
183
184
|
const encoded = encodeMultibase("base58btc", prefixed);
|
|
184
185
|
return new TextDecoder().decode(encoded);
|
|
185
186
|
}
|
|
186
187
|
|
|
187
|
-
// cSpell: ignore
|
|
188
|
+
// cSpell: ignore pkijs
|
package/tsdown.config.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { defineConfig } from "tsdown";
|
|
|
4
4
|
|
|
5
5
|
export default [
|
|
6
6
|
defineConfig({
|
|
7
|
-
entry: ["src/mod.ts"],
|
|
7
|
+
entry: ["src/mod.ts", "src/jsonld.ts"],
|
|
8
8
|
dts: { compilerOptions: { isolatedDeclarations: true, declaration: true } },
|
|
9
9
|
format: ["esm", "cjs"],
|
|
10
10
|
platform: "neutral",
|
|
File without changes
|
|
File without changes
|