@xyo-network/huri 2.90.23 → 2.91.1
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/dist/browser/Huri.d.cts +3 -3
- package/dist/browser/Huri.d.cts.map +1 -1
- package/dist/browser/Huri.d.mts +3 -3
- package/dist/browser/Huri.d.mts.map +1 -1
- package/dist/browser/Huri.d.ts +3 -3
- package/dist/browser/Huri.d.ts.map +1 -1
- package/dist/browser/index.cjs +3 -1
- package/dist/browser/index.cjs.map +1 -1
- package/dist/browser/index.js +3 -1
- package/dist/browser/index.js.map +1 -1
- package/dist/node/Huri.d.cts +3 -3
- package/dist/node/Huri.d.cts.map +1 -1
- package/dist/node/Huri.d.mts +3 -3
- package/dist/node/Huri.d.mts.map +1 -1
- package/dist/node/Huri.d.ts +3 -3
- package/dist/node/Huri.d.ts.map +1 -1
- package/dist/node/index.cjs +3 -1
- package/dist/node/index.cjs.map +1 -1
- package/dist/node/index.js +3 -1
- package/dist/node/index.js.map +1 -1
- package/package.json +9 -9
- package/src/Huri.ts +10 -5
package/dist/browser/Huri.d.cts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Hash } from '@xylabs/hex';
|
|
1
|
+
import { Address, Hash } from '@xylabs/hex';
|
|
2
2
|
import { Payload } from '@xyo-network/payload-model';
|
|
3
3
|
export type ObjectCategory = 'block' | 'payload';
|
|
4
4
|
export type HuriFetchFunction = (huri: Huri) => Promise<Payload | undefined>;
|
|
@@ -12,8 +12,8 @@ export interface FetchedPayload<T extends Payload = Payload> {
|
|
|
12
12
|
}
|
|
13
13
|
export declare class Huri<T extends Payload = Payload> {
|
|
14
14
|
archive?: string;
|
|
15
|
-
archivist?: string;
|
|
16
|
-
hash:
|
|
15
|
+
archivist?: Address | string;
|
|
16
|
+
hash: Hash;
|
|
17
17
|
originalHref: string;
|
|
18
18
|
protocol?: string;
|
|
19
19
|
token?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Huri.d.ts","sourceRoot":"","sources":["../../src/Huri.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"Huri.d.ts","sourceRoot":"","sources":["../../src/Huri.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAU,MAAM,aAAa,CAAA;AAEnD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,SAAS,CAAA;AAEhD,MAAM,MAAM,iBAAiB,GAAG,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAA;AAY5E,MAAM,WAAW,WAAW;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,cAAc,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO;IACzD,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,OAAO,EAAE,CAAC,CAAA;CACX;AAED,qBAAa,IAAI,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,IAAI,EAAE,IAAI,CAAA;IACV,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,CAAA;IAEd,OAAO,CAAC,MAAM,CAAO;gBAET,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,MAAM,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,GAAE,WAAgB;IA+BjF,IAAI,IAAI,WAaP;WAEY,KAAK,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAKnF,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO;;;IAM5B,OAAO,CAAC,MAAM,CAAC,SAAS;IAWxB,OAAO,CAAC,MAAM,CAAC,aAAa;IAYtB,KAAK,IAAI,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAIrC,QAAQ;IAIR,OAAO,CAAC,SAAS;IAwBjB,OAAO,CAAC,aAAa;CAUtB"}
|
package/dist/browser/Huri.d.mts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Hash } from '@xylabs/hex';
|
|
1
|
+
import { Address, Hash } from '@xylabs/hex';
|
|
2
2
|
import { Payload } from '@xyo-network/payload-model';
|
|
3
3
|
export type ObjectCategory = 'block' | 'payload';
|
|
4
4
|
export type HuriFetchFunction = (huri: Huri) => Promise<Payload | undefined>;
|
|
@@ -12,8 +12,8 @@ export interface FetchedPayload<T extends Payload = Payload> {
|
|
|
12
12
|
}
|
|
13
13
|
export declare class Huri<T extends Payload = Payload> {
|
|
14
14
|
archive?: string;
|
|
15
|
-
archivist?: string;
|
|
16
|
-
hash:
|
|
15
|
+
archivist?: Address | string;
|
|
16
|
+
hash: Hash;
|
|
17
17
|
originalHref: string;
|
|
18
18
|
protocol?: string;
|
|
19
19
|
token?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Huri.d.ts","sourceRoot":"","sources":["../../src/Huri.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"Huri.d.ts","sourceRoot":"","sources":["../../src/Huri.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAU,MAAM,aAAa,CAAA;AAEnD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,SAAS,CAAA;AAEhD,MAAM,MAAM,iBAAiB,GAAG,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAA;AAY5E,MAAM,WAAW,WAAW;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,cAAc,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO;IACzD,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,OAAO,EAAE,CAAC,CAAA;CACX;AAED,qBAAa,IAAI,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,IAAI,EAAE,IAAI,CAAA;IACV,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,CAAA;IAEd,OAAO,CAAC,MAAM,CAAO;gBAET,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,MAAM,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,GAAE,WAAgB;IA+BjF,IAAI,IAAI,WAaP;WAEY,KAAK,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAKnF,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO;;;IAM5B,OAAO,CAAC,MAAM,CAAC,SAAS;IAWxB,OAAO,CAAC,MAAM,CAAC,aAAa;IAYtB,KAAK,IAAI,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAIrC,QAAQ;IAIR,OAAO,CAAC,SAAS;IAwBjB,OAAO,CAAC,aAAa;CAUtB"}
|
package/dist/browser/Huri.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Hash } from '@xylabs/hex';
|
|
1
|
+
import { Address, Hash } from '@xylabs/hex';
|
|
2
2
|
import { Payload } from '@xyo-network/payload-model';
|
|
3
3
|
export type ObjectCategory = 'block' | 'payload';
|
|
4
4
|
export type HuriFetchFunction = (huri: Huri) => Promise<Payload | undefined>;
|
|
@@ -12,8 +12,8 @@ export interface FetchedPayload<T extends Payload = Payload> {
|
|
|
12
12
|
}
|
|
13
13
|
export declare class Huri<T extends Payload = Payload> {
|
|
14
14
|
archive?: string;
|
|
15
|
-
archivist?: string;
|
|
16
|
-
hash:
|
|
15
|
+
archivist?: Address | string;
|
|
16
|
+
hash: Hash;
|
|
17
17
|
originalHref: string;
|
|
18
18
|
protocol?: string;
|
|
19
19
|
token?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Huri.d.ts","sourceRoot":"","sources":["../../src/Huri.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"Huri.d.ts","sourceRoot":"","sources":["../../src/Huri.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAU,MAAM,aAAa,CAAA;AAEnD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,SAAS,CAAA;AAEhD,MAAM,MAAM,iBAAiB,GAAG,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAA;AAY5E,MAAM,WAAW,WAAW;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,cAAc,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO;IACzD,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,OAAO,EAAE,CAAC,CAAA;CACX;AAED,qBAAa,IAAI,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,IAAI,EAAE,IAAI,CAAA;IACV,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,CAAA;IAEd,OAAO,CAAC,MAAM,CAAO;gBAET,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,MAAM,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,GAAE,WAAgB;IA+BjF,IAAI,IAAI,WAaP;WAEY,KAAK,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAKnF,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO;;;IAM5B,OAAO,CAAC,MAAM,CAAC,SAAS;IAWxB,OAAO,CAAC,MAAM,CAAC,aAAa;IAYtB,KAAK,IAAI,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAIrC,QAAQ;IAIR,OAAO,CAAC,SAAS;IAwBjB,OAAO,CAAC,aAAa;CAUtB"}
|
package/dist/browser/index.cjs
CHANGED
|
@@ -28,6 +28,7 @@ module.exports = __toCommonJS(src_exports);
|
|
|
28
28
|
// src/Huri.ts
|
|
29
29
|
var import_assert = require("@xylabs/assert");
|
|
30
30
|
var import_axios = require("@xylabs/axios");
|
|
31
|
+
var import_hex = require("@xylabs/hex");
|
|
31
32
|
var import_account = require("@xyo-network/account");
|
|
32
33
|
var Huri = class _Huri {
|
|
33
34
|
static {
|
|
@@ -46,7 +47,8 @@ var Huri = class _Huri {
|
|
|
46
47
|
const protocol = _Huri.parseProtocol(huriString);
|
|
47
48
|
this.protocol = protocol ?? "https";
|
|
48
49
|
const path = (0, import_assert.assertEx)(_Huri.parsePath(huriString), "Missing path");
|
|
49
|
-
this.hash = this.parsePath(path, protocol !== void 0);
|
|
50
|
+
this.hash = (0, import_assert.assertEx)(this.parsePath(path, protocol !== void 0), "Missing hash");
|
|
51
|
+
(0, import_assert.assertEx)((0, import_hex.isHash)(this.hash), () => `Invalid hash [${this.hash}]`);
|
|
50
52
|
if (archivistUri) {
|
|
51
53
|
const archivistUriParts = archivistUri.split("://");
|
|
52
54
|
this.protocol = archivistUriParts[0];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/index.ts","../../src/Huri.ts"],"sourcesContent":["export * from './Huri'\n","import { assertEx } from '@xylabs/assert'\nimport { axios } from '@xylabs/axios'\nimport { Hash } from '@xylabs/hex'\nimport { AddressValue } from '@xyo-network/account'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport type ObjectCategory = 'block' | 'payload'\n\nexport type HuriFetchFunction = (huri: Huri) => Promise<Payload | undefined>\n\n/* \n Valid Huri:\n\n [<protocol>://][<archivist>/[<archive>/]]<hash>\n\n defaults:\n protocol: https\n archivist: api.archivist.xyo.network\n*/\n\nexport interface HuriOptions {\n archivistUri?: string\n token?: string\n}\n\nexport interface FetchedPayload<T extends Payload = Payload> {\n huri?: Huri\n payload: T\n}\n\nexport class Huri<T extends Payload = Payload> {\n archive?: string\n archivist?: string\n hash:
|
|
1
|
+
{"version":3,"sources":["../../src/index.ts","../../src/Huri.ts"],"sourcesContent":["export * from './Huri'\n","import { assertEx } from '@xylabs/assert'\nimport { axios } from '@xylabs/axios'\nimport { Address, Hash, isHash } from '@xylabs/hex'\nimport { AddressValue } from '@xyo-network/account'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport type ObjectCategory = 'block' | 'payload'\n\nexport type HuriFetchFunction = (huri: Huri) => Promise<Payload | undefined>\n\n/* \n Valid Huri:\n\n [<protocol>://][<archivist>/[<archive>/]]<hash>\n\n defaults:\n protocol: https\n archivist: api.archivist.xyo.network\n*/\n\nexport interface HuriOptions {\n archivistUri?: string\n token?: string\n}\n\nexport interface FetchedPayload<T extends Payload = Payload> {\n huri?: Huri\n payload: T\n}\n\nexport class Huri<T extends Payload = Payload> {\n archive?: string\n archivist?: Address | string\n hash: Hash\n originalHref: string\n protocol?: string\n token?: string\n\n private isHuri = true\n\n constructor(huri: Hash | Huri | string, { archivistUri, token }: HuriOptions = {}) {\n const huriString =\n Huri.isHuri(huri)?.href ??\n (typeof huri === 'string' ? (huri as string)\n : huri instanceof ArrayBuffer ? new AddressValue(huri).hex\n : huri.href)\n this.originalHref = huriString\n\n const protocol = Huri.parseProtocol(huriString)\n this.protocol = protocol ?? 'https'\n\n const path = assertEx(Huri.parsePath(huriString), 'Missing path')\n this.hash = assertEx(this.parsePath(path, protocol !== undefined), 'Missing hash') as Hash\n\n assertEx(isHash(this.hash), () => `Invalid hash [${this.hash}]`)\n\n //if archivistUri sent, overwrite protocol and archivist\n if (archivistUri) {\n const archivistUriParts = archivistUri.split('://')\n this.protocol = archivistUriParts[0]\n this.archivist = archivistUriParts[1]\n }\n\n this.token = token\n\n this.validateParse()\n }\n\n /*\n The full href or the hash\n */\n get href() {\n const parts: string[] = []\n if (this.protocol) {\n parts.push(`${this.protocol}:/`)\n }\n if (this.archive) {\n parts.push(`${this.archive}`)\n }\n if (this.archivist) {\n parts.push(`${this.archivist}`)\n }\n parts.push(this.hash)\n return parts.join('/')\n }\n\n static async fetch<T extends Payload = Payload>(huri: Huri): Promise<T | undefined> {\n const AuthHeader = huri.token ? { Authorization: `Bearer ${huri.token}` } : undefined\n return (await axios.get<T>(huri.href, { headers: AuthHeader })).data\n }\n\n static isHuri(value: unknown) {\n if (typeof value === 'object') {\n return (value as Huri).isHuri ? (value as Huri) : undefined\n }\n }\n\n private static parsePath(huri: string) {\n const protocolSplit = huri.split('//')\n assertEx(protocolSplit.length <= 2, () => `Invalid format [${huri}]`)\n if (protocolSplit.length === 1) {\n return huri\n }\n if (protocolSplit.length === 2) {\n return protocolSplit[1]\n }\n }\n\n private static parseProtocol(huri: string) {\n const protocolSplit = huri.split('//')\n assertEx(protocolSplit.length <= 2, () => `Invalid second protocol [${protocolSplit[2]}]`)\n const rawProtocol = protocolSplit.length === 2 ? protocolSplit.shift() : undefined\n if (rawProtocol) {\n const protocolParts = rawProtocol?.split(':')\n assertEx(protocolParts.length === 2, () => `Invalid protocol format [${rawProtocol}]`)\n assertEx(protocolParts[1].length === 0, () => `Invalid protocol format (post :) [${rawProtocol}]`)\n return protocolParts.shift()\n }\n }\n\n async fetch(): Promise<T | undefined> {\n return await Huri.fetch<T>(this)\n }\n\n toString() {\n return this.href\n }\n\n private parsePath(path: string, hasProtocol: boolean) {\n const pathParts = path.split('/')\n\n //if the protocol was found, then there is not allowed to be a leading /\n assertEx(!(hasProtocol && pathParts[0].length === 0), 'Invalid protocol separator')\n\n //remove leading '/' if needed\n pathParts[0].length === 0 ? pathParts.shift() : null\n\n //hash is assumed to be the last part\n const hash = assertEx(pathParts.pop(), 'No hash specified')\n\n //archivist is assumed to be the first part\n this.archivist = pathParts.shift() ?? 'api.archivist.xyo.network'\n\n //the archive is whatever is left\n this.archive = pathParts.pop()\n\n //after we pull off all the path parts, there should be nothing left\n assertEx(pathParts.length === 0, 'Too many path parts')\n\n return hash\n }\n\n private validateParse() {\n //the archivist should not be zero length\n assertEx(this.archivist?.length !== 0, 'Invalid archivist length')\n\n //the archivist should not be zero length (can be undefined)\n assertEx(this.archive?.length !== 0, 'Invalid archive length')\n\n //the archive should not be set if the archivist is not set\n assertEx(!(this.archive && !this.archivist), 'If specifying archive, archivist is also required')\n }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;ACAA,oBAAyB;AACzB,mBAAsB;AACtB,iBAAsC;AACtC,qBAA6B;AA2BtB,IAAMA,OAAN,MAAMA,MAAAA;EA9Bb,OA8BaA;;;EACXC;EACAC;EACAC;EACAC;EACAC;EACAC;EAEQC,SAAS;EAEjBC,YAAYC,MAA4B,EAAEC,cAAcJ,MAAK,IAAkB,CAAC,GAAG;AACjF,UAAMK,aACJX,MAAKO,OAAOE,IAAAA,GAAOG,SAClB,OAAOH,SAAS,WAAYA,OAC3BA,gBAAgBI,cAAc,IAAIC,4BAAaL,IAAAA,EAAMM,MACrDN,KAAKG;AACT,SAAKR,eAAeO;AAEpB,UAAMN,WAAWL,MAAKgB,cAAcL,UAAAA;AACpC,SAAKN,WAAWA,YAAY;AAE5B,UAAMY,WAAOC,wBAASlB,MAAKmB,UAAUR,UAAAA,GAAa,cAAA;AAClD,SAAKR,WAAOe,wBAAS,KAAKC,UAAUF,MAAMZ,aAAae,MAAAA,GAAY,cAAA;AAEnEF,oCAASG,mBAAO,KAAKlB,IAAI,GAAG,MAAM,iBAAiB,KAAKA,IAAI,GAAG;AAG/D,QAAIO,cAAc;AAChB,YAAMY,oBAAoBZ,aAAaa,MAAM,KAAA;AAC7C,WAAKlB,WAAWiB,kBAAkB,CAAA;AAClC,WAAKpB,YAAYoB,kBAAkB,CAAA;IACrC;AAEA,SAAKhB,QAAQA;AAEb,SAAKkB,cAAa;EACpB;;;;EAKA,IAAIZ,OAAO;AACT,UAAMa,QAAkB,CAAA;AACxB,QAAI,KAAKpB,UAAU;AACjBoB,YAAMC,KAAK,GAAG,KAAKrB,QAAQ,IAAI;IACjC;AACA,QAAI,KAAKJ,SAAS;AAChBwB,YAAMC,KAAK,GAAG,KAAKzB,OAAO,EAAE;IAC9B;AACA,QAAI,KAAKC,WAAW;AAClBuB,YAAMC,KAAK,GAAG,KAAKxB,SAAS,EAAE;IAChC;AACAuB,UAAMC,KAAK,KAAKvB,IAAI;AACpB,WAAOsB,MAAME,KAAK,GAAA;EACpB;EAEA,aAAaC,MAAmCnB,MAAoC;AAClF,UAAMoB,aAAapB,KAAKH,QAAQ;MAAEwB,eAAe,UAAUrB,KAAKH,KAAK;IAAG,IAAIc;AAC5E,YAAQ,MAAMW,mBAAMC,IAAOvB,KAAKG,MAAM;MAAEqB,SAASJ;IAAW,CAAA,GAAIK;EAClE;EAEA,OAAO3B,OAAO4B,OAAgB;AAC5B,QAAI,OAAOA,UAAU,UAAU;AAC7B,aAAQA,MAAe5B,SAAU4B,QAAiBf;IACpD;EACF;EAEA,OAAeD,UAAUV,MAAc;AACrC,UAAM2B,gBAAgB3B,KAAKc,MAAM,IAAA;AACjCL,gCAASkB,cAAcC,UAAU,GAAG,MAAM,mBAAmB5B,IAAAA,GAAO;AACpE,QAAI2B,cAAcC,WAAW,GAAG;AAC9B,aAAO5B;IACT;AACA,QAAI2B,cAAcC,WAAW,GAAG;AAC9B,aAAOD,cAAc,CAAA;IACvB;EACF;EAEA,OAAepB,cAAcP,MAAc;AACzC,UAAM2B,gBAAgB3B,KAAKc,MAAM,IAAA;AACjCL,gCAASkB,cAAcC,UAAU,GAAG,MAAM,4BAA4BD,cAAc,CAAA,CAAE,GAAG;AACzF,UAAME,cAAcF,cAAcC,WAAW,IAAID,cAAcG,MAAK,IAAKnB;AACzE,QAAIkB,aAAa;AACf,YAAME,gBAAgBF,aAAaf,MAAM,GAAA;AACzCL,kCAASsB,cAAcH,WAAW,GAAG,MAAM,4BAA4BC,WAAAA,GAAc;AACrFpB,kCAASsB,cAAc,CAAA,EAAGH,WAAW,GAAG,MAAM,qCAAqCC,WAAAA,GAAc;AACjG,aAAOE,cAAcD,MAAK;IAC5B;EACF;EAEA,MAAMX,QAAgC;AACpC,WAAO,MAAM5B,MAAK4B,MAAS,IAAI;EACjC;EAEAa,WAAW;AACT,WAAO,KAAK7B;EACd;EAEQO,UAAUF,MAAcyB,aAAsB;AACpD,UAAMC,YAAY1B,KAAKM,MAAM,GAAA;AAG7BL,gCAAS,EAAEwB,eAAeC,UAAU,CAAA,EAAGN,WAAW,IAAI,4BAAA;AAGtDM,cAAU,CAAA,EAAGN,WAAW,IAAIM,UAAUJ,MAAK,IAAK;AAGhD,UAAMpC,WAAOe,wBAASyB,UAAUC,IAAG,GAAI,mBAAA;AAGvC,SAAK1C,YAAYyC,UAAUJ,MAAK,KAAM;AAGtC,SAAKtC,UAAU0C,UAAUC,IAAG;AAG5B1B,gCAASyB,UAAUN,WAAW,GAAG,qBAAA;AAEjC,WAAOlC;EACT;EAEQqB,gBAAgB;AAEtBN,gCAAS,KAAKhB,WAAWmC,WAAW,GAAG,0BAAA;AAGvCnB,gCAAS,KAAKjB,SAASoC,WAAW,GAAG,wBAAA;AAGrCnB,gCAAS,EAAE,KAAKjB,WAAW,CAAC,KAAKC,YAAY,mDAAA;EAC/C;AACF;","names":["Huri","archive","archivist","hash","originalHref","protocol","token","isHuri","constructor","huri","archivistUri","huriString","href","ArrayBuffer","AddressValue","hex","parseProtocol","path","assertEx","parsePath","undefined","isHash","archivistUriParts","split","validateParse","parts","push","join","fetch","AuthHeader","Authorization","axios","get","headers","data","value","protocolSplit","length","rawProtocol","shift","protocolParts","toString","hasProtocol","pathParts","pop"]}
|
package/dist/browser/index.js
CHANGED
|
@@ -4,6 +4,7 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
|
|
|
4
4
|
// src/Huri.ts
|
|
5
5
|
import { assertEx } from "@xylabs/assert";
|
|
6
6
|
import { axios } from "@xylabs/axios";
|
|
7
|
+
import { isHash } from "@xylabs/hex";
|
|
7
8
|
import { AddressValue } from "@xyo-network/account";
|
|
8
9
|
var Huri = class _Huri {
|
|
9
10
|
static {
|
|
@@ -22,7 +23,8 @@ var Huri = class _Huri {
|
|
|
22
23
|
const protocol = _Huri.parseProtocol(huriString);
|
|
23
24
|
this.protocol = protocol ?? "https";
|
|
24
25
|
const path = assertEx(_Huri.parsePath(huriString), "Missing path");
|
|
25
|
-
this.hash = this.parsePath(path, protocol !== void 0);
|
|
26
|
+
this.hash = assertEx(this.parsePath(path, protocol !== void 0), "Missing hash");
|
|
27
|
+
assertEx(isHash(this.hash), () => `Invalid hash [${this.hash}]`);
|
|
26
28
|
if (archivistUri) {
|
|
27
29
|
const archivistUriParts = archivistUri.split("://");
|
|
28
30
|
this.protocol = archivistUriParts[0];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/Huri.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { axios } from '@xylabs/axios'\nimport { Hash } from '@xylabs/hex'\nimport { AddressValue } from '@xyo-network/account'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport type ObjectCategory = 'block' | 'payload'\n\nexport type HuriFetchFunction = (huri: Huri) => Promise<Payload | undefined>\n\n/* \n Valid Huri:\n\n [<protocol>://][<archivist>/[<archive>/]]<hash>\n\n defaults:\n protocol: https\n archivist: api.archivist.xyo.network\n*/\n\nexport interface HuriOptions {\n archivistUri?: string\n token?: string\n}\n\nexport interface FetchedPayload<T extends Payload = Payload> {\n huri?: Huri\n payload: T\n}\n\nexport class Huri<T extends Payload = Payload> {\n archive?: string\n archivist?: string\n hash:
|
|
1
|
+
{"version":3,"sources":["../../src/Huri.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { axios } from '@xylabs/axios'\nimport { Address, Hash, isHash } from '@xylabs/hex'\nimport { AddressValue } from '@xyo-network/account'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport type ObjectCategory = 'block' | 'payload'\n\nexport type HuriFetchFunction = (huri: Huri) => Promise<Payload | undefined>\n\n/* \n Valid Huri:\n\n [<protocol>://][<archivist>/[<archive>/]]<hash>\n\n defaults:\n protocol: https\n archivist: api.archivist.xyo.network\n*/\n\nexport interface HuriOptions {\n archivistUri?: string\n token?: string\n}\n\nexport interface FetchedPayload<T extends Payload = Payload> {\n huri?: Huri\n payload: T\n}\n\nexport class Huri<T extends Payload = Payload> {\n archive?: string\n archivist?: Address | string\n hash: Hash\n originalHref: string\n protocol?: string\n token?: string\n\n private isHuri = true\n\n constructor(huri: Hash | Huri | string, { archivistUri, token }: HuriOptions = {}) {\n const huriString =\n Huri.isHuri(huri)?.href ??\n (typeof huri === 'string' ? (huri as string)\n : huri instanceof ArrayBuffer ? new AddressValue(huri).hex\n : huri.href)\n this.originalHref = huriString\n\n const protocol = Huri.parseProtocol(huriString)\n this.protocol = protocol ?? 'https'\n\n const path = assertEx(Huri.parsePath(huriString), 'Missing path')\n this.hash = assertEx(this.parsePath(path, protocol !== undefined), 'Missing hash') as Hash\n\n assertEx(isHash(this.hash), () => `Invalid hash [${this.hash}]`)\n\n //if archivistUri sent, overwrite protocol and archivist\n if (archivistUri) {\n const archivistUriParts = archivistUri.split('://')\n this.protocol = archivistUriParts[0]\n this.archivist = archivistUriParts[1]\n }\n\n this.token = token\n\n this.validateParse()\n }\n\n /*\n The full href or the hash\n */\n get href() {\n const parts: string[] = []\n if (this.protocol) {\n parts.push(`${this.protocol}:/`)\n }\n if (this.archive) {\n parts.push(`${this.archive}`)\n }\n if (this.archivist) {\n parts.push(`${this.archivist}`)\n }\n parts.push(this.hash)\n return parts.join('/')\n }\n\n static async fetch<T extends Payload = Payload>(huri: Huri): Promise<T | undefined> {\n const AuthHeader = huri.token ? { Authorization: `Bearer ${huri.token}` } : undefined\n return (await axios.get<T>(huri.href, { headers: AuthHeader })).data\n }\n\n static isHuri(value: unknown) {\n if (typeof value === 'object') {\n return (value as Huri).isHuri ? (value as Huri) : undefined\n }\n }\n\n private static parsePath(huri: string) {\n const protocolSplit = huri.split('//')\n assertEx(protocolSplit.length <= 2, () => `Invalid format [${huri}]`)\n if (protocolSplit.length === 1) {\n return huri\n }\n if (protocolSplit.length === 2) {\n return protocolSplit[1]\n }\n }\n\n private static parseProtocol(huri: string) {\n const protocolSplit = huri.split('//')\n assertEx(protocolSplit.length <= 2, () => `Invalid second protocol [${protocolSplit[2]}]`)\n const rawProtocol = protocolSplit.length === 2 ? protocolSplit.shift() : undefined\n if (rawProtocol) {\n const protocolParts = rawProtocol?.split(':')\n assertEx(protocolParts.length === 2, () => `Invalid protocol format [${rawProtocol}]`)\n assertEx(protocolParts[1].length === 0, () => `Invalid protocol format (post :) [${rawProtocol}]`)\n return protocolParts.shift()\n }\n }\n\n async fetch(): Promise<T | undefined> {\n return await Huri.fetch<T>(this)\n }\n\n toString() {\n return this.href\n }\n\n private parsePath(path: string, hasProtocol: boolean) {\n const pathParts = path.split('/')\n\n //if the protocol was found, then there is not allowed to be a leading /\n assertEx(!(hasProtocol && pathParts[0].length === 0), 'Invalid protocol separator')\n\n //remove leading '/' if needed\n pathParts[0].length === 0 ? pathParts.shift() : null\n\n //hash is assumed to be the last part\n const hash = assertEx(pathParts.pop(), 'No hash specified')\n\n //archivist is assumed to be the first part\n this.archivist = pathParts.shift() ?? 'api.archivist.xyo.network'\n\n //the archive is whatever is left\n this.archive = pathParts.pop()\n\n //after we pull off all the path parts, there should be nothing left\n assertEx(pathParts.length === 0, 'Too many path parts')\n\n return hash\n }\n\n private validateParse() {\n //the archivist should not be zero length\n assertEx(this.archivist?.length !== 0, 'Invalid archivist length')\n\n //the archivist should not be zero length (can be undefined)\n assertEx(this.archive?.length !== 0, 'Invalid archive length')\n\n //the archive should not be set if the archivist is not set\n assertEx(!(this.archive && !this.archivist), 'If specifying archive, archivist is also required')\n }\n}\n"],"mappings":"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","names":["assertEx","axios","isHash","AddressValue","Huri","archive","archivist","hash","originalHref","protocol","token","isHuri","constructor","huri","archivistUri","huriString","href","ArrayBuffer","AddressValue","hex","parseProtocol","path","assertEx","parsePath","undefined","isHash","archivistUriParts","split","validateParse","parts","push","join","fetch","AuthHeader","Authorization","axios","get","headers","data","value","protocolSplit","length","rawProtocol","shift","protocolParts","toString","hasProtocol","pathParts","pop"]}
|
package/dist/node/Huri.d.cts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Hash } from '@xylabs/hex';
|
|
1
|
+
import { Address, Hash } from '@xylabs/hex';
|
|
2
2
|
import { Payload } from '@xyo-network/payload-model';
|
|
3
3
|
export type ObjectCategory = 'block' | 'payload';
|
|
4
4
|
export type HuriFetchFunction = (huri: Huri) => Promise<Payload | undefined>;
|
|
@@ -12,8 +12,8 @@ export interface FetchedPayload<T extends Payload = Payload> {
|
|
|
12
12
|
}
|
|
13
13
|
export declare class Huri<T extends Payload = Payload> {
|
|
14
14
|
archive?: string;
|
|
15
|
-
archivist?: string;
|
|
16
|
-
hash:
|
|
15
|
+
archivist?: Address | string;
|
|
16
|
+
hash: Hash;
|
|
17
17
|
originalHref: string;
|
|
18
18
|
protocol?: string;
|
|
19
19
|
token?: string;
|
package/dist/node/Huri.d.cts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Huri.d.ts","sourceRoot":"","sources":["../../src/Huri.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"Huri.d.ts","sourceRoot":"","sources":["../../src/Huri.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAU,MAAM,aAAa,CAAA;AAEnD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,SAAS,CAAA;AAEhD,MAAM,MAAM,iBAAiB,GAAG,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAA;AAY5E,MAAM,WAAW,WAAW;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,cAAc,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO;IACzD,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,OAAO,EAAE,CAAC,CAAA;CACX;AAED,qBAAa,IAAI,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,IAAI,EAAE,IAAI,CAAA;IACV,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,CAAA;IAEd,OAAO,CAAC,MAAM,CAAO;gBAET,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,MAAM,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,GAAE,WAAgB;IA+BjF,IAAI,IAAI,WAaP;WAEY,KAAK,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAKnF,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO;;;IAM5B,OAAO,CAAC,MAAM,CAAC,SAAS;IAWxB,OAAO,CAAC,MAAM,CAAC,aAAa;IAYtB,KAAK,IAAI,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAIrC,QAAQ;IAIR,OAAO,CAAC,SAAS;IAwBjB,OAAO,CAAC,aAAa;CAUtB"}
|
package/dist/node/Huri.d.mts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Hash } from '@xylabs/hex';
|
|
1
|
+
import { Address, Hash } from '@xylabs/hex';
|
|
2
2
|
import { Payload } from '@xyo-network/payload-model';
|
|
3
3
|
export type ObjectCategory = 'block' | 'payload';
|
|
4
4
|
export type HuriFetchFunction = (huri: Huri) => Promise<Payload | undefined>;
|
|
@@ -12,8 +12,8 @@ export interface FetchedPayload<T extends Payload = Payload> {
|
|
|
12
12
|
}
|
|
13
13
|
export declare class Huri<T extends Payload = Payload> {
|
|
14
14
|
archive?: string;
|
|
15
|
-
archivist?: string;
|
|
16
|
-
hash:
|
|
15
|
+
archivist?: Address | string;
|
|
16
|
+
hash: Hash;
|
|
17
17
|
originalHref: string;
|
|
18
18
|
protocol?: string;
|
|
19
19
|
token?: string;
|
package/dist/node/Huri.d.mts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Huri.d.ts","sourceRoot":"","sources":["../../src/Huri.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"Huri.d.ts","sourceRoot":"","sources":["../../src/Huri.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAU,MAAM,aAAa,CAAA;AAEnD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,SAAS,CAAA;AAEhD,MAAM,MAAM,iBAAiB,GAAG,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAA;AAY5E,MAAM,WAAW,WAAW;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,cAAc,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO;IACzD,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,OAAO,EAAE,CAAC,CAAA;CACX;AAED,qBAAa,IAAI,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,IAAI,EAAE,IAAI,CAAA;IACV,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,CAAA;IAEd,OAAO,CAAC,MAAM,CAAO;gBAET,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,MAAM,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,GAAE,WAAgB;IA+BjF,IAAI,IAAI,WAaP;WAEY,KAAK,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAKnF,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO;;;IAM5B,OAAO,CAAC,MAAM,CAAC,SAAS;IAWxB,OAAO,CAAC,MAAM,CAAC,aAAa;IAYtB,KAAK,IAAI,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAIrC,QAAQ;IAIR,OAAO,CAAC,SAAS;IAwBjB,OAAO,CAAC,aAAa;CAUtB"}
|
package/dist/node/Huri.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Hash } from '@xylabs/hex';
|
|
1
|
+
import { Address, Hash } from '@xylabs/hex';
|
|
2
2
|
import { Payload } from '@xyo-network/payload-model';
|
|
3
3
|
export type ObjectCategory = 'block' | 'payload';
|
|
4
4
|
export type HuriFetchFunction = (huri: Huri) => Promise<Payload | undefined>;
|
|
@@ -12,8 +12,8 @@ export interface FetchedPayload<T extends Payload = Payload> {
|
|
|
12
12
|
}
|
|
13
13
|
export declare class Huri<T extends Payload = Payload> {
|
|
14
14
|
archive?: string;
|
|
15
|
-
archivist?: string;
|
|
16
|
-
hash:
|
|
15
|
+
archivist?: Address | string;
|
|
16
|
+
hash: Hash;
|
|
17
17
|
originalHref: string;
|
|
18
18
|
protocol?: string;
|
|
19
19
|
token?: string;
|
package/dist/node/Huri.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Huri.d.ts","sourceRoot":"","sources":["../../src/Huri.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"Huri.d.ts","sourceRoot":"","sources":["../../src/Huri.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAU,MAAM,aAAa,CAAA;AAEnD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,SAAS,CAAA;AAEhD,MAAM,MAAM,iBAAiB,GAAG,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAA;AAY5E,MAAM,WAAW,WAAW;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,cAAc,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO;IACzD,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,OAAO,EAAE,CAAC,CAAA;CACX;AAED,qBAAa,IAAI,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,IAAI,EAAE,IAAI,CAAA;IACV,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,CAAA;IAEd,OAAO,CAAC,MAAM,CAAO;gBAET,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,MAAM,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,GAAE,WAAgB;IA+BjF,IAAI,IAAI,WAaP;WAEY,KAAK,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAKnF,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO;;;IAM5B,OAAO,CAAC,MAAM,CAAC,SAAS;IAWxB,OAAO,CAAC,MAAM,CAAC,aAAa;IAYtB,KAAK,IAAI,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAIrC,QAAQ;IAIR,OAAO,CAAC,SAAS;IAwBjB,OAAO,CAAC,aAAa;CAUtB"}
|
package/dist/node/index.cjs
CHANGED
|
@@ -28,6 +28,7 @@ module.exports = __toCommonJS(src_exports);
|
|
|
28
28
|
// src/Huri.ts
|
|
29
29
|
var import_assert = require("@xylabs/assert");
|
|
30
30
|
var import_axios = require("@xylabs/axios");
|
|
31
|
+
var import_hex = require("@xylabs/hex");
|
|
31
32
|
var import_account = require("@xyo-network/account");
|
|
32
33
|
var _Huri = class _Huri {
|
|
33
34
|
archive;
|
|
@@ -44,7 +45,8 @@ var _Huri = class _Huri {
|
|
|
44
45
|
const protocol = _Huri.parseProtocol(huriString);
|
|
45
46
|
this.protocol = protocol ?? "https";
|
|
46
47
|
const path = (0, import_assert.assertEx)(_Huri.parsePath(huriString), "Missing path");
|
|
47
|
-
this.hash = this.parsePath(path, protocol !== void 0);
|
|
48
|
+
this.hash = (0, import_assert.assertEx)(this.parsePath(path, protocol !== void 0), "Missing hash");
|
|
49
|
+
(0, import_assert.assertEx)((0, import_hex.isHash)(this.hash), () => `Invalid hash [${this.hash}]`);
|
|
48
50
|
if (archivistUri) {
|
|
49
51
|
const archivistUriParts = archivistUri.split("://");
|
|
50
52
|
this.protocol = archivistUriParts[0];
|
package/dist/node/index.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/index.ts","../../src/Huri.ts"],"sourcesContent":["export * from './Huri'\n","import { assertEx } from '@xylabs/assert'\nimport { axios } from '@xylabs/axios'\nimport { Hash } from '@xylabs/hex'\nimport { AddressValue } from '@xyo-network/account'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport type ObjectCategory = 'block' | 'payload'\n\nexport type HuriFetchFunction = (huri: Huri) => Promise<Payload | undefined>\n\n/* \n Valid Huri:\n\n [<protocol>://][<archivist>/[<archive>/]]<hash>\n\n defaults:\n protocol: https\n archivist: api.archivist.xyo.network\n*/\n\nexport interface HuriOptions {\n archivistUri?: string\n token?: string\n}\n\nexport interface FetchedPayload<T extends Payload = Payload> {\n huri?: Huri\n payload: T\n}\n\nexport class Huri<T extends Payload = Payload> {\n archive?: string\n archivist?: string\n hash:
|
|
1
|
+
{"version":3,"sources":["../../src/index.ts","../../src/Huri.ts"],"sourcesContent":["export * from './Huri'\n","import { assertEx } from '@xylabs/assert'\nimport { axios } from '@xylabs/axios'\nimport { Address, Hash, isHash } from '@xylabs/hex'\nimport { AddressValue } from '@xyo-network/account'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport type ObjectCategory = 'block' | 'payload'\n\nexport type HuriFetchFunction = (huri: Huri) => Promise<Payload | undefined>\n\n/* \n Valid Huri:\n\n [<protocol>://][<archivist>/[<archive>/]]<hash>\n\n defaults:\n protocol: https\n archivist: api.archivist.xyo.network\n*/\n\nexport interface HuriOptions {\n archivistUri?: string\n token?: string\n}\n\nexport interface FetchedPayload<T extends Payload = Payload> {\n huri?: Huri\n payload: T\n}\n\nexport class Huri<T extends Payload = Payload> {\n archive?: string\n archivist?: Address | string\n hash: Hash\n originalHref: string\n protocol?: string\n token?: string\n\n private isHuri = true\n\n constructor(huri: Hash | Huri | string, { archivistUri, token }: HuriOptions = {}) {\n const huriString =\n Huri.isHuri(huri)?.href ??\n (typeof huri === 'string' ? (huri as string)\n : huri instanceof ArrayBuffer ? new AddressValue(huri).hex\n : huri.href)\n this.originalHref = huriString\n\n const protocol = Huri.parseProtocol(huriString)\n this.protocol = protocol ?? 'https'\n\n const path = assertEx(Huri.parsePath(huriString), 'Missing path')\n this.hash = assertEx(this.parsePath(path, protocol !== undefined), 'Missing hash') as Hash\n\n assertEx(isHash(this.hash), () => `Invalid hash [${this.hash}]`)\n\n //if archivistUri sent, overwrite protocol and archivist\n if (archivistUri) {\n const archivistUriParts = archivistUri.split('://')\n this.protocol = archivistUriParts[0]\n this.archivist = archivistUriParts[1]\n }\n\n this.token = token\n\n this.validateParse()\n }\n\n /*\n The full href or the hash\n */\n get href() {\n const parts: string[] = []\n if (this.protocol) {\n parts.push(`${this.protocol}:/`)\n }\n if (this.archive) {\n parts.push(`${this.archive}`)\n }\n if (this.archivist) {\n parts.push(`${this.archivist}`)\n }\n parts.push(this.hash)\n return parts.join('/')\n }\n\n static async fetch<T extends Payload = Payload>(huri: Huri): Promise<T | undefined> {\n const AuthHeader = huri.token ? { Authorization: `Bearer ${huri.token}` } : undefined\n return (await axios.get<T>(huri.href, { headers: AuthHeader })).data\n }\n\n static isHuri(value: unknown) {\n if (typeof value === 'object') {\n return (value as Huri).isHuri ? (value as Huri) : undefined\n }\n }\n\n private static parsePath(huri: string) {\n const protocolSplit = huri.split('//')\n assertEx(protocolSplit.length <= 2, () => `Invalid format [${huri}]`)\n if (protocolSplit.length === 1) {\n return huri\n }\n if (protocolSplit.length === 2) {\n return protocolSplit[1]\n }\n }\n\n private static parseProtocol(huri: string) {\n const protocolSplit = huri.split('//')\n assertEx(protocolSplit.length <= 2, () => `Invalid second protocol [${protocolSplit[2]}]`)\n const rawProtocol = protocolSplit.length === 2 ? protocolSplit.shift() : undefined\n if (rawProtocol) {\n const protocolParts = rawProtocol?.split(':')\n assertEx(protocolParts.length === 2, () => `Invalid protocol format [${rawProtocol}]`)\n assertEx(protocolParts[1].length === 0, () => `Invalid protocol format (post :) [${rawProtocol}]`)\n return protocolParts.shift()\n }\n }\n\n async fetch(): Promise<T | undefined> {\n return await Huri.fetch<T>(this)\n }\n\n toString() {\n return this.href\n }\n\n private parsePath(path: string, hasProtocol: boolean) {\n const pathParts = path.split('/')\n\n //if the protocol was found, then there is not allowed to be a leading /\n assertEx(!(hasProtocol && pathParts[0].length === 0), 'Invalid protocol separator')\n\n //remove leading '/' if needed\n pathParts[0].length === 0 ? pathParts.shift() : null\n\n //hash is assumed to be the last part\n const hash = assertEx(pathParts.pop(), 'No hash specified')\n\n //archivist is assumed to be the first part\n this.archivist = pathParts.shift() ?? 'api.archivist.xyo.network'\n\n //the archive is whatever is left\n this.archive = pathParts.pop()\n\n //after we pull off all the path parts, there should be nothing left\n assertEx(pathParts.length === 0, 'Too many path parts')\n\n return hash\n }\n\n private validateParse() {\n //the archivist should not be zero length\n assertEx(this.archivist?.length !== 0, 'Invalid archivist length')\n\n //the archivist should not be zero length (can be undefined)\n assertEx(this.archive?.length !== 0, 'Invalid archive length')\n\n //the archive should not be set if the archivist is not set\n assertEx(!(this.archive && !this.archivist), 'If specifying archive, archivist is also required')\n }\n}\n"],"mappings":"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","names":["Huri","archive","archivist","hash","originalHref","protocol","token","isHuri","constructor","huri","archivistUri","huriString","href","ArrayBuffer","AddressValue","hex","parseProtocol","path","assertEx","parsePath","undefined","isHash","archivistUriParts","split","validateParse","parts","push","join","fetch","AuthHeader","Authorization","axios","get","headers","data","value","protocolSplit","length","rawProtocol","shift","protocolParts","toString","hasProtocol","pathParts","pop"]}
|
package/dist/node/index.js
CHANGED
|
@@ -4,6 +4,7 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
|
|
|
4
4
|
// src/Huri.ts
|
|
5
5
|
import { assertEx } from "@xylabs/assert";
|
|
6
6
|
import { axios } from "@xylabs/axios";
|
|
7
|
+
import { isHash } from "@xylabs/hex";
|
|
7
8
|
import { AddressValue } from "@xyo-network/account";
|
|
8
9
|
var _Huri = class _Huri {
|
|
9
10
|
archive;
|
|
@@ -20,7 +21,8 @@ var _Huri = class _Huri {
|
|
|
20
21
|
const protocol = _Huri.parseProtocol(huriString);
|
|
21
22
|
this.protocol = protocol ?? "https";
|
|
22
23
|
const path = assertEx(_Huri.parsePath(huriString), "Missing path");
|
|
23
|
-
this.hash = this.parsePath(path, protocol !== void 0);
|
|
24
|
+
this.hash = assertEx(this.parsePath(path, protocol !== void 0), "Missing hash");
|
|
25
|
+
assertEx(isHash(this.hash), () => `Invalid hash [${this.hash}]`);
|
|
24
26
|
if (archivistUri) {
|
|
25
27
|
const archivistUriParts = archivistUri.split("://");
|
|
26
28
|
this.protocol = archivistUriParts[0];
|
package/dist/node/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/Huri.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { axios } from '@xylabs/axios'\nimport { Hash } from '@xylabs/hex'\nimport { AddressValue } from '@xyo-network/account'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport type ObjectCategory = 'block' | 'payload'\n\nexport type HuriFetchFunction = (huri: Huri) => Promise<Payload | undefined>\n\n/* \n Valid Huri:\n\n [<protocol>://][<archivist>/[<archive>/]]<hash>\n\n defaults:\n protocol: https\n archivist: api.archivist.xyo.network\n*/\n\nexport interface HuriOptions {\n archivistUri?: string\n token?: string\n}\n\nexport interface FetchedPayload<T extends Payload = Payload> {\n huri?: Huri\n payload: T\n}\n\nexport class Huri<T extends Payload = Payload> {\n archive?: string\n archivist?: string\n hash:
|
|
1
|
+
{"version":3,"sources":["../../src/Huri.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { axios } from '@xylabs/axios'\nimport { Address, Hash, isHash } from '@xylabs/hex'\nimport { AddressValue } from '@xyo-network/account'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport type ObjectCategory = 'block' | 'payload'\n\nexport type HuriFetchFunction = (huri: Huri) => Promise<Payload | undefined>\n\n/* \n Valid Huri:\n\n [<protocol>://][<archivist>/[<archive>/]]<hash>\n\n defaults:\n protocol: https\n archivist: api.archivist.xyo.network\n*/\n\nexport interface HuriOptions {\n archivistUri?: string\n token?: string\n}\n\nexport interface FetchedPayload<T extends Payload = Payload> {\n huri?: Huri\n payload: T\n}\n\nexport class Huri<T extends Payload = Payload> {\n archive?: string\n archivist?: Address | string\n hash: Hash\n originalHref: string\n protocol?: string\n token?: string\n\n private isHuri = true\n\n constructor(huri: Hash | Huri | string, { archivistUri, token }: HuriOptions = {}) {\n const huriString =\n Huri.isHuri(huri)?.href ??\n (typeof huri === 'string' ? (huri as string)\n : huri instanceof ArrayBuffer ? new AddressValue(huri).hex\n : huri.href)\n this.originalHref = huriString\n\n const protocol = Huri.parseProtocol(huriString)\n this.protocol = protocol ?? 'https'\n\n const path = assertEx(Huri.parsePath(huriString), 'Missing path')\n this.hash = assertEx(this.parsePath(path, protocol !== undefined), 'Missing hash') as Hash\n\n assertEx(isHash(this.hash), () => `Invalid hash [${this.hash}]`)\n\n //if archivistUri sent, overwrite protocol and archivist\n if (archivistUri) {\n const archivistUriParts = archivistUri.split('://')\n this.protocol = archivistUriParts[0]\n this.archivist = archivistUriParts[1]\n }\n\n this.token = token\n\n this.validateParse()\n }\n\n /*\n The full href or the hash\n */\n get href() {\n const parts: string[] = []\n if (this.protocol) {\n parts.push(`${this.protocol}:/`)\n }\n if (this.archive) {\n parts.push(`${this.archive}`)\n }\n if (this.archivist) {\n parts.push(`${this.archivist}`)\n }\n parts.push(this.hash)\n return parts.join('/')\n }\n\n static async fetch<T extends Payload = Payload>(huri: Huri): Promise<T | undefined> {\n const AuthHeader = huri.token ? { Authorization: `Bearer ${huri.token}` } : undefined\n return (await axios.get<T>(huri.href, { headers: AuthHeader })).data\n }\n\n static isHuri(value: unknown) {\n if (typeof value === 'object') {\n return (value as Huri).isHuri ? (value as Huri) : undefined\n }\n }\n\n private static parsePath(huri: string) {\n const protocolSplit = huri.split('//')\n assertEx(protocolSplit.length <= 2, () => `Invalid format [${huri}]`)\n if (protocolSplit.length === 1) {\n return huri\n }\n if (protocolSplit.length === 2) {\n return protocolSplit[1]\n }\n }\n\n private static parseProtocol(huri: string) {\n const protocolSplit = huri.split('//')\n assertEx(protocolSplit.length <= 2, () => `Invalid second protocol [${protocolSplit[2]}]`)\n const rawProtocol = protocolSplit.length === 2 ? protocolSplit.shift() : undefined\n if (rawProtocol) {\n const protocolParts = rawProtocol?.split(':')\n assertEx(protocolParts.length === 2, () => `Invalid protocol format [${rawProtocol}]`)\n assertEx(protocolParts[1].length === 0, () => `Invalid protocol format (post :) [${rawProtocol}]`)\n return protocolParts.shift()\n }\n }\n\n async fetch(): Promise<T | undefined> {\n return await Huri.fetch<T>(this)\n }\n\n toString() {\n return this.href\n }\n\n private parsePath(path: string, hasProtocol: boolean) {\n const pathParts = path.split('/')\n\n //if the protocol was found, then there is not allowed to be a leading /\n assertEx(!(hasProtocol && pathParts[0].length === 0), 'Invalid protocol separator')\n\n //remove leading '/' if needed\n pathParts[0].length === 0 ? pathParts.shift() : null\n\n //hash is assumed to be the last part\n const hash = assertEx(pathParts.pop(), 'No hash specified')\n\n //archivist is assumed to be the first part\n this.archivist = pathParts.shift() ?? 'api.archivist.xyo.network'\n\n //the archive is whatever is left\n this.archive = pathParts.pop()\n\n //after we pull off all the path parts, there should be nothing left\n assertEx(pathParts.length === 0, 'Too many path parts')\n\n return hash\n }\n\n private validateParse() {\n //the archivist should not be zero length\n assertEx(this.archivist?.length !== 0, 'Invalid archivist length')\n\n //the archivist should not be zero length (can be undefined)\n assertEx(this.archive?.length !== 0, 'Invalid archive length')\n\n //the archive should not be set if the archivist is not set\n assertEx(!(this.archive && !this.archivist), 'If specifying archive, archivist is also required')\n }\n}\n"],"mappings":"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","names":["assertEx","axios","isHash","AddressValue","Huri","archive","archivist","hash","originalHref","protocol","token","isHuri","constructor","huri","archivistUri","huriString","href","ArrayBuffer","AddressValue","hex","parseProtocol","path","assertEx","parsePath","undefined","isHash","archivistUriParts","split","validateParse","parts","push","join","fetch","AuthHeader","Authorization","axios","get","headers","data","value","protocolSplit","length","rawProtocol","shift","protocolParts","toString","hasProtocol","pathParts","pop"]}
|
package/package.json
CHANGED
|
@@ -10,16 +10,16 @@
|
|
|
10
10
|
"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@xylabs/assert": "^
|
|
14
|
-
"@xylabs/axios": "^
|
|
15
|
-
"@xylabs/hex": "^
|
|
16
|
-
"@xyo-network/account": "~2.
|
|
17
|
-
"@xyo-network/payload-model": "~2.
|
|
13
|
+
"@xylabs/assert": "^3.0.2",
|
|
14
|
+
"@xylabs/axios": "^3.0.2",
|
|
15
|
+
"@xylabs/hex": "^3.0.2",
|
|
16
|
+
"@xyo-network/account": "~2.91.1",
|
|
17
|
+
"@xyo-network/payload-model": "~2.91.1"
|
|
18
18
|
},
|
|
19
19
|
"devDependencies": {
|
|
20
|
-
"@xylabs/delay": "^
|
|
21
|
-
"@xylabs/ts-scripts-yarn3": "^3.
|
|
22
|
-
"@xylabs/tsconfig": "^3.
|
|
20
|
+
"@xylabs/delay": "^3.0.2",
|
|
21
|
+
"@xylabs/ts-scripts-yarn3": "^3.4.1",
|
|
22
|
+
"@xylabs/tsconfig": "^3.4.1",
|
|
23
23
|
"typescript": "^5.3.3"
|
|
24
24
|
},
|
|
25
25
|
"description": "Primary SDK for using XYO Protocol 2.0",
|
|
@@ -61,6 +61,6 @@
|
|
|
61
61
|
},
|
|
62
62
|
"sideEffects": false,
|
|
63
63
|
"types": "dist/node/index.d.ts",
|
|
64
|
-
"version": "2.
|
|
64
|
+
"version": "2.91.1",
|
|
65
65
|
"type": "module"
|
|
66
66
|
}
|
package/src/Huri.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { assertEx } from '@xylabs/assert'
|
|
2
2
|
import { axios } from '@xylabs/axios'
|
|
3
|
-
import { Hash } from '@xylabs/hex'
|
|
3
|
+
import { Address, Hash, isHash } from '@xylabs/hex'
|
|
4
4
|
import { AddressValue } from '@xyo-network/account'
|
|
5
5
|
import { Payload } from '@xyo-network/payload-model'
|
|
6
6
|
|
|
@@ -30,8 +30,8 @@ export interface FetchedPayload<T extends Payload = Payload> {
|
|
|
30
30
|
|
|
31
31
|
export class Huri<T extends Payload = Payload> {
|
|
32
32
|
archive?: string
|
|
33
|
-
archivist?: string
|
|
34
|
-
hash:
|
|
33
|
+
archivist?: Address | string
|
|
34
|
+
hash: Hash
|
|
35
35
|
originalHref: string
|
|
36
36
|
protocol?: string
|
|
37
37
|
token?: string
|
|
@@ -40,14 +40,19 @@ export class Huri<T extends Payload = Payload> {
|
|
|
40
40
|
|
|
41
41
|
constructor(huri: Hash | Huri | string, { archivistUri, token }: HuriOptions = {}) {
|
|
42
42
|
const huriString =
|
|
43
|
-
Huri.isHuri(huri)?.href ??
|
|
43
|
+
Huri.isHuri(huri)?.href ??
|
|
44
|
+
(typeof huri === 'string' ? (huri as string)
|
|
45
|
+
: huri instanceof ArrayBuffer ? new AddressValue(huri).hex
|
|
46
|
+
: huri.href)
|
|
44
47
|
this.originalHref = huriString
|
|
45
48
|
|
|
46
49
|
const protocol = Huri.parseProtocol(huriString)
|
|
47
50
|
this.protocol = protocol ?? 'https'
|
|
48
51
|
|
|
49
52
|
const path = assertEx(Huri.parsePath(huriString), 'Missing path')
|
|
50
|
-
this.hash = this.parsePath(path, protocol !== undefined)
|
|
53
|
+
this.hash = assertEx(this.parsePath(path, protocol !== undefined), 'Missing hash') as Hash
|
|
54
|
+
|
|
55
|
+
assertEx(isHash(this.hash), () => `Invalid hash [${this.hash}]`)
|
|
51
56
|
|
|
52
57
|
//if archivistUri sent, overwrite protocol and archivist
|
|
53
58
|
if (archivistUri) {
|