@xyo-network/huri 2.90.21 → 2.90.23

package/dist/browser/index.cjs

@@ -41,7 +41,7 @@ var Huri = class _Huri {
   token;
   isHuri = true;
   constructor(huri, { archivistUri, token } = {}) {
-    const huriString = _Huri.isHuri(huri)?.href ?? typeof huri === "string" ? huri : huri instanceof ArrayBuffer ? new import_account.AddressValue(huri).hex : huri.href;
+    const huriString = _Huri.isHuri(huri)?.href ?? (typeof huri === "string" ? huri : huri instanceof ArrayBuffer ? new import_account.AddressValue(huri).hex : huri.href);
     this.originalHref = huriString;
     const protocol = _Huri.parseProtocol(huriString);
     this.protocol = protocol ?? "https";

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 { 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: string\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 ?? typeof huri === 'string' ? (huri as string) : huri instanceof ArrayBuffer ? new AddressValue(huri).hex : 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 = this.parsePath(path, protocol !== undefined)\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","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 { 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: string\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 ?? (typeof huri === 'string' ? (huri as string) : huri instanceof ArrayBuffer ? new AddressValue(huri).hex : 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 = this.parsePath(path, protocol !== undefined)\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","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

@@ -17,7 +17,7 @@ var Huri = class _Huri {
   token;
   isHuri = true;
   constructor(huri, { archivistUri, token } = {}) {
-    const huriString = _Huri.isHuri(huri)?.href ?? typeof huri === "string" ? huri : huri instanceof ArrayBuffer ? new AddressValue(huri).hex : huri.href;
+    const huriString = _Huri.isHuri(huri)?.href ?? (typeof huri === "string" ? huri : huri instanceof ArrayBuffer ? new AddressValue(huri).hex : huri.href);
     this.originalHref = huriString;
     const protocol = _Huri.parseProtocol(huriString);
     this.protocol = protocol ?? "https";

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 { 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: string\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 ?? typeof huri === 'string' ? (huri as string) : huri instanceof ArrayBuffer ? new AddressValue(huri).hex : 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 = this.parsePath(path, protocol !== undefined)\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","AddressValue","Huri","archive","archivist","hash","originalHref","protocol","token","isHuri","constructor","huri","archivistUri","huriString","href","ArrayBuffer","AddressValue","hex","parseProtocol","path","assertEx","parsePath","undefined","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 { 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: string\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 ?? (typeof huri === 'string' ? (huri as string) : huri instanceof ArrayBuffer ? new AddressValue(huri).hex : 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 = this.parsePath(path, protocol !== undefined)\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","AddressValue","Huri","archive","archivist","hash","originalHref","protocol","token","isHuri","constructor","huri","archivistUri","huriString","href","ArrayBuffer","AddressValue","hex","parseProtocol","path","assertEx","parsePath","undefined","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

@@ -39,7 +39,7 @@ var _Huri = class _Huri {
   isHuri = true;
   constructor(huri, { archivistUri, token } = {}) {
     var _a;
-    const huriString = ((_a = _Huri.isHuri(huri)) == null ? void 0 : _a.href) ?? typeof huri === "string" ? huri : huri instanceof ArrayBuffer ? new import_account.AddressValue(huri).hex : huri.href;
+    const huriString = ((_a = _Huri.isHuri(huri)) == null ? void 0 : _a.href) ?? (typeof huri === "string" ? huri : huri instanceof ArrayBuffer ? new import_account.AddressValue(huri).hex : huri.href);
     this.originalHref = huriString;
     const protocol = _Huri.parseProtocol(huriString);
     this.protocol = protocol ?? "https";

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 { 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: string\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 ?? typeof huri === 'string' ? (huri as string) : huri instanceof ArrayBuffer ? new AddressValue(huri).hex : 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 = this.parsePath(path, protocol !== undefined)\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","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 { 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: string\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 ?? (typeof huri === 'string' ? (huri as string) : huri instanceof ArrayBuffer ? new AddressValue(huri).hex : 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 = this.parsePath(path, protocol !== undefined)\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","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

@@ -15,7 +15,7 @@ var _Huri = class _Huri {
   isHuri = true;
   constructor(huri, { archivistUri, token } = {}) {
     var _a;
-    const huriString = ((_a = _Huri.isHuri(huri)) == null ? void 0 : _a.href) ?? typeof huri === "string" ? huri : huri instanceof ArrayBuffer ? new AddressValue(huri).hex : huri.href;
+    const huriString = ((_a = _Huri.isHuri(huri)) == null ? void 0 : _a.href) ?? (typeof huri === "string" ? huri : huri instanceof ArrayBuffer ? new AddressValue(huri).hex : huri.href);
     this.originalHref = huriString;
     const protocol = _Huri.parseProtocol(huriString);
     this.protocol = protocol ?? "https";

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 { 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: string\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 ?? typeof huri === 'string' ? (huri as string) : huri instanceof ArrayBuffer ? new AddressValue(huri).hex : 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 = this.parsePath(path, protocol !== undefined)\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,SAASA,gBAAgB;AACzB,SAASC,aAAa;AAEtB,SAASC,oBAAoB;AA2BtB,IAAMC,QAAN,MAAMA,MAAAA;EACXC;EACAC;EACAC;EACAC;EACAC;EACAC;EAEQC,SAAS;EAEjBC,YAAYC,MAA4B,EAAEC,cAAcJ,MAAK,IAAkB,CAAC,GAAG;AAxCrF;AAyCI,UAAMK,eACJX,WAAKO,OAAOE,IAAAA,MAAZT,mBAAmBY,SAAQ,OAAOH,SAAS,WAAYA,OAAkBA,gBAAgBI,cAAc,IAAIC,aAAaL,IAAAA,EAAMM,MAAMN,KAAKG;AAC3I,SAAKR,eAAeO;AAEpB,UAAMN,WAAWL,MAAKgB,cAAcL,UAAAA;AACpC,SAAKN,WAAWA,YAAY;AAE5B,UAAMY,OAAOC,SAASlB,MAAKmB,UAAUR,UAAAA,GAAa,cAAA;AAClD,SAAKR,OAAO,KAAKgB,UAAUF,MAAMZ,aAAae,MAAAA;AAG9C,QAAIV,cAAc;AAChB,YAAMW,oBAAoBX,aAAaY,MAAM,KAAA;AAC7C,WAAKjB,WAAWgB,kBAAkB,CAAA;AAClC,WAAKnB,YAAYmB,kBAAkB,CAAA;IACrC;AAEA,SAAKf,QAAQA;AAEb,SAAKiB,cAAa;EACpB;;;;EAKA,IAAIX,OAAO;AACT,UAAMY,QAAkB,CAAA;AACxB,QAAI,KAAKnB,UAAU;AACjBmB,YAAMC,KAAK,GAAG,KAAKpB,QAAQ,IAAI;IACjC;AACA,QAAI,KAAKJ,SAAS;AAChBuB,YAAMC,KAAK,GAAG,KAAKxB,OAAO,EAAE;IAC9B;AACA,QAAI,KAAKC,WAAW;AAClBsB,YAAMC,KAAK,GAAG,KAAKvB,SAAS,EAAE;IAChC;AACAsB,UAAMC,KAAK,KAAKtB,IAAI;AACpB,WAAOqB,MAAME,KAAK,GAAA;EACpB;EAEA,aAAaC,MAAmClB,MAAoC;AAClF,UAAMmB,aAAanB,KAAKH,QAAQ;MAAEuB,eAAe,UAAUpB,KAAKH,KAAK;IAAG,IAAIc;AAC5E,YAAQ,MAAMU,MAAMC,IAAOtB,KAAKG,MAAM;MAAEoB,SAASJ;IAAW,CAAA,GAAIK;EAClE;EAEA,OAAO1B,OAAO2B,OAAgB;AAC5B,QAAI,OAAOA,UAAU,UAAU;AAC7B,aAAQA,MAAe3B,SAAU2B,QAAiBd;IACpD;EACF;EAEA,OAAeD,UAAUV,MAAc;AACrC,UAAM0B,gBAAgB1B,KAAKa,MAAM,IAAA;AACjCJ,aAASiB,cAAcC,UAAU,GAAG,MAAM,mBAAmB3B,IAAAA,GAAO;AACpE,QAAI0B,cAAcC,WAAW,GAAG;AAC9B,aAAO3B;IACT;AACA,QAAI0B,cAAcC,WAAW,GAAG;AAC9B,aAAOD,cAAc,CAAA;IACvB;EACF;EAEA,OAAenB,cAAcP,MAAc;AACzC,UAAM0B,gBAAgB1B,KAAKa,MAAM,IAAA;AACjCJ,aAASiB,cAAcC,UAAU,GAAG,MAAM,4BAA4BD,cAAc,CAAA,CAAE,GAAG;AACzF,UAAME,cAAcF,cAAcC,WAAW,IAAID,cAAcG,MAAK,IAAKlB;AACzE,QAAIiB,aAAa;AACf,YAAME,gBAAgBF,2CAAaf,MAAM;AACzCJ,eAASqB,cAAcH,WAAW,GAAG,MAAM,4BAA4BC,WAAAA,GAAc;AACrFnB,eAASqB,cAAc,CAAA,EAAGH,WAAW,GAAG,MAAM,qCAAqCC,WAAAA,GAAc;AACjG,aAAOE,cAAcD,MAAK;IAC5B;EACF;EAEA,MAAMX,QAAgC;AACpC,WAAO,MAAM3B,MAAK2B,MAAS,IAAI;EACjC;EAEAa,WAAW;AACT,WAAO,KAAK5B;EACd;EAEQO,UAAUF,MAAcwB,aAAsB;AACpD,UAAMC,YAAYzB,KAAKK,MAAM,GAAA;AAG7BJ,aAAS,EAAEuB,eAAeC,UAAU,CAAA,EAAGN,WAAW,IAAI,4BAAA;AAGtDM,cAAU,CAAA,EAAGN,WAAW,IAAIM,UAAUJ,MAAK,IAAK;AAGhD,UAAMnC,OAAOe,SAASwB,UAAUC,IAAG,GAAI,mBAAA;AAGvC,SAAKzC,YAAYwC,UAAUJ,MAAK,KAAM;AAGtC,SAAKrC,UAAUyC,UAAUC,IAAG;AAG5BzB,aAASwB,UAAUN,WAAW,GAAG,qBAAA;AAEjC,WAAOjC;EACT;EAEQoB,gBAAgB;AAnJ1B;AAqJIL,eAAS,UAAKhB,cAAL,mBAAgBkC,YAAW,GAAG,0BAAA;AAGvClB,eAAS,UAAKjB,YAAL,mBAAcmC,YAAW,GAAG,wBAAA;AAGrClB,aAAS,EAAE,KAAKjB,WAAW,CAAC,KAAKC,YAAY,mDAAA;EAC/C;AACF;AA/HaF;AAAN,IAAMA,OAAN;","names":["assertEx","axios","AddressValue","Huri","archive","archivist","hash","originalHref","protocol","token","isHuri","constructor","huri","archivistUri","huriString","href","ArrayBuffer","AddressValue","hex","parseProtocol","path","assertEx","parsePath","undefined","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 { 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: string\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 ?? (typeof huri === 'string' ? (huri as string) : huri instanceof ArrayBuffer ? new AddressValue(huri).hex : 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 = this.parsePath(path, protocol !== undefined)\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","AddressValue","Huri","archive","archivist","hash","originalHref","protocol","token","isHuri","constructor","huri","archivistUri","huriString","href","ArrayBuffer","AddressValue","hex","parseProtocol","path","assertEx","parsePath","undefined","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": "^2.14.2",
-    "@xylabs/axios": "^2.14.2",
-    "@xylabs/hex": "^2.14.2",
-    "@xyo-network/account": "~2.90.21",
-    "@xyo-network/payload-model": "~2.90.21"
+    "@xylabs/assert": "^2.14.3",
+    "@xylabs/axios": "^2.14.3",
+    "@xylabs/hex": "^2.14.3",
+    "@xyo-network/account": "~2.90.23",
+    "@xyo-network/payload-model": "~2.90.23"
   },
   "devDependencies": {
-    "@xylabs/delay": "^2.14.2",
+    "@xylabs/delay": "^2.14.3",
     "@xylabs/ts-scripts-yarn3": "^3.2.42",
     "@xylabs/tsconfig": "^3.2.42",
     "typescript": "^5.3.3"
@@ -61,6 +61,6 @@
   },
   "sideEffects": false,
   "types": "dist/node/index.d.ts",
-  "version": "2.90.21",
+  "version": "2.90.23",
   "type": "module"
 }

package/src/Huri.ts

@@ -40,7 +40,7 @@ export class Huri<T extends Payload = Payload> {
 
   constructor(huri: Hash | Huri | string, { archivistUri, token }: HuriOptions = {}) {
     const huriString =
-      Huri.isHuri(huri)?.href ?? typeof huri === 'string' ? (huri as string) : huri instanceof ArrayBuffer ? new AddressValue(huri).hex : huri.href
+      Huri.isHuri(huri)?.href ?? (typeof huri === 'string' ? (huri as string) : huri instanceof ArrayBuffer ? new AddressValue(huri).hex : huri.href)
     this.originalHref = huriString
 
     const protocol = Huri.parseProtocol(huriString)