@xyo-network/huri 2.92.7 → 2.92.8

package/dist/browser/index.cjs

@@ -46,8 +46,8 @@ var Huri = class _Huri {
     this.originalHref = huriString;
     const protocol = _Huri.parseProtocol(huriString);
     this.protocol = protocol ?? "https";
-    const path = (0, import_assert.assertEx)(_Huri.parsePath(huriString), "Missing path");
-    this.hash = (0, import_assert.assertEx)(this.parsePath(path, protocol !== void 0), "Missing hash");
+    const path = (0, import_assert.assertEx)(_Huri.parsePath(huriString), () => "Missing path");
+    this.hash = (0, import_assert.assertEx)(this.parsePath(path, protocol !== void 0), () => "Missing hash");
     (0, import_assert.assertEx)((0, import_hex.isHash)(this.hash), () => `Invalid hash [${this.hash}]`);
     if (archivistUri) {
       const archivistUriParts = archivistUri.split("://");
@@ -116,18 +116,18 @@ var Huri = class _Huri {
   }
   parsePath(path, hasProtocol) {
     const pathParts = path.split("/");
-    (0, import_assert.assertEx)(!(hasProtocol && pathParts[0].length === 0), "Invalid protocol separator");
+    (0, import_assert.assertEx)(!(hasProtocol && pathParts[0].length === 0), () => "Invalid protocol separator");
     pathParts[0].length === 0 ? pathParts.shift() : null;
-    const hash = (0, import_assert.assertEx)(pathParts.pop(), "No hash specified");
+    const hash = (0, import_assert.assertEx)(pathParts.pop(), () => "No hash specified");
     this.archivist = pathParts.shift() ?? "api.archivist.xyo.network";
     this.archive = pathParts.pop();
-    (0, import_assert.assertEx)(pathParts.length === 0, "Too many path parts");
+    (0, import_assert.assertEx)(pathParts.length === 0, () => "Too many path parts");
     return hash;
   }
   validateParse() {
-    (0, import_assert.assertEx)(this.archivist?.length !== 0, "Invalid archivist length");
-    (0, import_assert.assertEx)(this.archive?.length !== 0, "Invalid archive length");
-    (0, import_assert.assertEx)(!(this.archive && !this.archivist), "If specifying archive, archivist is also required");
+    (0, import_assert.assertEx)(this.archivist?.length !== 0, () => "Invalid archivist length");
+    (0, import_assert.assertEx)(this.archive?.length !== 0, () => "Invalid archive length");
+    (0, import_assert.assertEx)(!(this.archive && !this.archivist), () => "If specifying archive, archivist is also required");
   }
 };
 //# sourceMappingURL=index.cjs.map

package/dist/browser/index.cjs.map

@@ -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 { 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"]}
+{"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/browser/index.js

@@ -22,8 +22,8 @@ var Huri = class _Huri {
     this.originalHref = huriString;
     const protocol = _Huri.parseProtocol(huriString);
     this.protocol = protocol ?? "https";
-    const path = assertEx(_Huri.parsePath(huriString), "Missing path");
-    this.hash = assertEx(this.parsePath(path, protocol !== void 0), "Missing hash");
+    const path = assertEx(_Huri.parsePath(huriString), () => "Missing path");
+    this.hash = assertEx(this.parsePath(path, protocol !== void 0), () => "Missing hash");
     assertEx(isHash(this.hash), () => `Invalid hash [${this.hash}]`);
     if (archivistUri) {
       const archivistUriParts = archivistUri.split("://");
@@ -92,18 +92,18 @@ var Huri = class _Huri {
   }
   parsePath(path, hasProtocol) {
     const pathParts = path.split("/");
-    assertEx(!(hasProtocol && pathParts[0].length === 0), "Invalid protocol separator");
+    assertEx(!(hasProtocol && pathParts[0].length === 0), () => "Invalid protocol separator");
     pathParts[0].length === 0 ? pathParts.shift() : null;
-    const hash = assertEx(pathParts.pop(), "No hash specified");
+    const hash = assertEx(pathParts.pop(), () => "No hash specified");
     this.archivist = pathParts.shift() ?? "api.archivist.xyo.network";
     this.archive = pathParts.pop();
-    assertEx(pathParts.length === 0, "Too many path parts");
+    assertEx(pathParts.length === 0, () => "Too many path parts");
     return hash;
   }
   validateParse() {
-    assertEx(this.archivist?.length !== 0, "Invalid archivist length");
-    assertEx(this.archive?.length !== 0, "Invalid archive length");
-    assertEx(!(this.archive && !this.archivist), "If specifying archive, archivist is also required");
+    assertEx(this.archivist?.length !== 0, () => "Invalid archivist length");
+    assertEx(this.archive?.length !== 0, () => "Invalid archive length");
+    assertEx(!(this.archive && !this.archivist), () => "If specifying archive, archivist is also required");
   }
 };
 export {

package/dist/browser/index.js.map

@@ -1 +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"]}
+{"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/index.cjs

@@ -44,8 +44,8 @@ var _Huri = class _Huri {
     this.originalHref = huriString;
     const protocol = _Huri.parseProtocol(huriString);
     this.protocol = protocol ?? "https";
-    const path = (0, import_assert.assertEx)(_Huri.parsePath(huriString), "Missing path");
-    this.hash = (0, import_assert.assertEx)(this.parsePath(path, protocol !== void 0), "Missing hash");
+    const path = (0, import_assert.assertEx)(_Huri.parsePath(huriString), () => "Missing path");
+    this.hash = (0, import_assert.assertEx)(this.parsePath(path, protocol !== void 0), () => "Missing hash");
     (0, import_assert.assertEx)((0, import_hex.isHash)(this.hash), () => `Invalid hash [${this.hash}]`);
     if (archivistUri) {
       const archivistUriParts = archivistUri.split("://");
@@ -114,19 +114,19 @@ var _Huri = class _Huri {
   }
   parsePath(path, hasProtocol) {
     const pathParts = path.split("/");
-    (0, import_assert.assertEx)(!(hasProtocol && pathParts[0].length === 0), "Invalid protocol separator");
+    (0, import_assert.assertEx)(!(hasProtocol && pathParts[0].length === 0), () => "Invalid protocol separator");
     pathParts[0].length === 0 ? pathParts.shift() : null;
-    const hash = (0, import_assert.assertEx)(pathParts.pop(), "No hash specified");
+    const hash = (0, import_assert.assertEx)(pathParts.pop(), () => "No hash specified");
     this.archivist = pathParts.shift() ?? "api.archivist.xyo.network";
     this.archive = pathParts.pop();
-    (0, import_assert.assertEx)(pathParts.length === 0, "Too many path parts");
+    (0, import_assert.assertEx)(pathParts.length === 0, () => "Too many path parts");
     return hash;
   }
   validateParse() {
     var _a, _b;
-    (0, import_assert.assertEx)(((_a = this.archivist) == null ? void 0 : _a.length) !== 0, "Invalid archivist length");
-    (0, import_assert.assertEx)(((_b = this.archive) == null ? void 0 : _b.length) !== 0, "Invalid archive length");
-    (0, import_assert.assertEx)(!(this.archive && !this.archivist), "If specifying archive, archivist is also required");
+    (0, import_assert.assertEx)(((_a = this.archivist) == null ? void 0 : _a.length) !== 0, () => "Invalid archivist length");
+    (0, import_assert.assertEx)(((_b = this.archive) == null ? void 0 : _b.length) !== 0, () => "Invalid archive length");
+    (0, import_assert.assertEx)(!(this.archive && !this.archivist), () => "If specifying archive, archivist is also required");
   }
 };
 __name(_Huri, "Huri");

package/dist/node/index.cjs.map

@@ -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 { 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"]}
+{"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

@@ -20,8 +20,8 @@ var _Huri = class _Huri {
     this.originalHref = huriString;
     const protocol = _Huri.parseProtocol(huriString);
     this.protocol = protocol ?? "https";
-    const path = assertEx(_Huri.parsePath(huriString), "Missing path");
-    this.hash = assertEx(this.parsePath(path, protocol !== void 0), "Missing hash");
+    const path = assertEx(_Huri.parsePath(huriString), () => "Missing path");
+    this.hash = assertEx(this.parsePath(path, protocol !== void 0), () => "Missing hash");
     assertEx(isHash(this.hash), () => `Invalid hash [${this.hash}]`);
     if (archivistUri) {
       const archivistUriParts = archivistUri.split("://");
@@ -90,19 +90,19 @@ var _Huri = class _Huri {
   }
   parsePath(path, hasProtocol) {
     const pathParts = path.split("/");
-    assertEx(!(hasProtocol && pathParts[0].length === 0), "Invalid protocol separator");
+    assertEx(!(hasProtocol && pathParts[0].length === 0), () => "Invalid protocol separator");
     pathParts[0].length === 0 ? pathParts.shift() : null;
-    const hash = assertEx(pathParts.pop(), "No hash specified");
+    const hash = assertEx(pathParts.pop(), () => "No hash specified");
     this.archivist = pathParts.shift() ?? "api.archivist.xyo.network";
     this.archive = pathParts.pop();
-    assertEx(pathParts.length === 0, "Too many path parts");
+    assertEx(pathParts.length === 0, () => "Too many path parts");
     return hash;
   }
   validateParse() {
     var _a, _b;
-    assertEx(((_a = this.archivist) == null ? void 0 : _a.length) !== 0, "Invalid archivist length");
-    assertEx(((_b = this.archive) == null ? void 0 : _b.length) !== 0, "Invalid archive length");
-    assertEx(!(this.archive && !this.archivist), "If specifying archive, archivist is also required");
+    assertEx(((_a = this.archivist) == null ? void 0 : _a.length) !== 0, () => "Invalid archivist length");
+    assertEx(((_b = this.archive) == null ? void 0 : _b.length) !== 0, () => "Invalid archive length");
+    assertEx(!(this.archive && !this.archivist), () => "If specifying archive, archivist is also required");
   }
 };
 __name(_Huri, "Huri");

package/dist/node/index.js.map

@@ -1 +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"]}
+{"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

@@ -10,14 +10,14 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xylabs/assert": "^3.0.13",
-    "@xylabs/axios": "^3.0.13",
-    "@xylabs/hex": "^3.0.13",
-    "@xyo-network/account": "~2.92.7",
-    "@xyo-network/payload-model": "~2.92.7"
+    "@xylabs/assert": "^3.0.15",
+    "@xylabs/axios": "^3.0.15",
+    "@xylabs/hex": "^3.0.15",
+    "@xyo-network/account": "~2.92.8",
+    "@xyo-network/payload-model": "~2.92.8"
   },
   "devDependencies": {
-    "@xylabs/delay": "^3.0.13",
+    "@xylabs/delay": "^3.0.15",
     "@xylabs/ts-scripts-yarn3": "^3.5.2",
     "@xylabs/tsconfig": "^3.5.2",
     "typescript": "^5.4.2"
@@ -61,6 +61,6 @@
   },
   "sideEffects": false,
   "types": "dist/node/index.d.ts",
-  "version": "2.92.7",
+  "version": "2.92.8",
   "type": "module"
 }

package/src/Huri.ts

@@ -49,8 +49,8 @@ export class Huri<T extends Payload = Payload> {
     const protocol = Huri.parseProtocol(huriString)
     this.protocol = protocol ?? 'https'
 
-    const path = assertEx(Huri.parsePath(huriString), 'Missing path')
-    this.hash = assertEx(this.parsePath(path, protocol !== undefined), 'Missing hash') as Hash
+    const path = assertEx(Huri.parsePath(huriString), () => 'Missing path')
+    this.hash = assertEx(this.parsePath(path, protocol !== undefined), () => 'Missing hash') as Hash
 
     assertEx(isHash(this.hash), () => `Invalid hash [${this.hash}]`)
 
@@ -130,13 +130,13 @@ export class Huri<T extends Payload = Payload> {
     const pathParts = path.split('/')
 
     //if the protocol was found, then there is not allowed to be a leading /
-    assertEx(!(hasProtocol && pathParts[0].length === 0), 'Invalid protocol separator')
+    assertEx(!(hasProtocol && pathParts[0].length === 0), () => 'Invalid protocol separator')
 
     //remove leading '/' if needed
     pathParts[0].length === 0 ? pathParts.shift() : null
 
     //hash is assumed to be the last part
-    const hash = assertEx(pathParts.pop(), 'No hash specified')
+    const hash = assertEx(pathParts.pop(), () => 'No hash specified')
 
     //archivist is assumed to be the first part
     this.archivist = pathParts.shift() ?? 'api.archivist.xyo.network'
@@ -145,19 +145,19 @@ export class Huri<T extends Payload = Payload> {
     this.archive = pathParts.pop()
 
     //after we pull off all the path parts, there should be nothing left
-    assertEx(pathParts.length === 0, 'Too many path parts')
+    assertEx(pathParts.length === 0, () => 'Too many path parts')
 
     return hash
   }
 
   private validateParse() {
     //the archivist should not be zero length
-    assertEx(this.archivist?.length !== 0, 'Invalid archivist length')
+    assertEx(this.archivist?.length !== 0, () => 'Invalid archivist length')
 
     //the archivist should not be zero length (can be undefined)
-    assertEx(this.archive?.length !== 0, 'Invalid archive length')
+    assertEx(this.archive?.length !== 0, () => 'Invalid archive length')
 
     //the archive should not be set if the archivist is not set
-    assertEx(!(this.archive && !this.archivist), 'If specifying archive, archivist is also required')
+    assertEx(!(this.archive && !this.archivist), () => 'If specifying archive, archivist is also required')
   }
 }