@ddd-qc/cell-proxy 0.26.9 → 0.27.0

package/dist/ConductorAppProxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConductorAppProxy.js","sourceRoot":"","sources":["../src/ConductorAppProxy.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  AppInfoResponse,\n  AppWebsocket,\n  CallZomeRequest,\n  InstalledAppId,\n  CreateCloneCellRequest,\n  DisableCloneCellRequest,\n  EnableCloneCellRequest,\n  ClonedCell,\n  NetworkInfo,\n  NetworkInfoRequest,\n  Timestamp,\n  AppClient,\n  AppEvents,\n  AppSignalCb,\n  AppNetworkInfoRequest,\n  NetworkInfoResponse,\n  AdminWebsocket,\n} from \"@holochain/client\";\nimport { UnsubscribeFunction } from \"emittery\";\nimport {AppProxy} from \"./AppProxy\";\nimport {CellIdStr} from \"./types\";\nimport {AgentId, DnaId} from \"./hash\";\nimport {AgentIdMap} from \"./holochain-id-map\";\n\n\n/**\n * Creates, connects and holds an appWebsocket.\n * Creates and holds Cell proxies for this appWebsocket.\n * Maintains a mapping between CellIds and HCLs\n * Handles SignalHandlers per HCL\n * Stores appSignal logs\n * TODO Implement Singleton per App port?\n */\nexport class ConductorAppProxy extends AppProxy implements AppClient {\n\n  /** -- Fields -- */\n\n  private _appWs!: AppWebsocket;\n\n\n  /** -- Getters -- */\n\n  ///** Check this after connecting since AppWebsocket can shamelessly override the provided args. */\n  //get appIdOfShame(): InstalledAppId | undefined { return this._appWs.overrideInstalledAppId;}\n\n\n  /** -- AppClient (Passthrough to appWebsocket) -- */\n\n  async callZome(req: CallZomeRequest, timeout?: number): Promise<unknown> {\n    timeout = timeout ? timeout : this.defaultTimeout\n    return this._appWs.callZome(req, timeout)\n  }\n\n  async appInfo(): Promise<AppInfoResponse> {\n    return this._appWs!.appInfo();\n  }\n\n  on<Name extends keyof AppEvents>(\n    eventName: Name | readonly Name[],\n    listener: AppSignalCb\n  ): UnsubscribeFunction {\n    return this._appWs!.on(eventName, listener);\n  }\n\n  async createCloneCell(request: CreateCloneCellRequest): Promise<ClonedCell> {\n    //console.log(\"createCloneCell() called:\", request)\n    return this._appWs!.createCloneCell(request);\n  }\n\n  async enableCloneCell(request: EnableCloneCellRequest): Promise<ClonedCell> {\n    //console.log(\"enableCloneCell() called:\", request)\n    return this._appWs!.enableCloneCell(request);\n  }\n\n  async disableCloneCell(request: DisableCloneCellRequest): Promise<void> {\n    //console.log(\"disableCloneCell() called:\", request)\n    return this._appWs!.disableCloneCell(request);\n  }\n\n  // async networkInfo(args: AppNetworkInfoRequest): Promise<NetworkInfoResponse> {\n  //   return this._appWs!.networkInfo(args);\n  // }\n\n\n  /** */\n  async networkInfo(args: AppNetworkInfoRequest): Promise<NetworkInfoResponse> {\n    //const agent = encodeHashToBase64();\n    const agentId = new AgentId(this._appWs.myPubKey);\n    /* Call networkInfo */\n    const response = await this._appWs.networkInfo({\n      dnas: args.dnas,\n      last_time_queried: this._lastTimeQueriedMap.get(agentId)\n    } as NetworkInfoRequest);\n    this._lastTimeQueriedMap.set(agentId, Date.now());\n\n    /* Convert result */\n    let i = 0;\n    //let result = {}\n    for (const netInfo of response) {\n      const dnaId = new DnaId(args.dnas[i]);\n      //result[dnaHash] = [this._lastTimeQueriedMap[agent], netInfo];\n      /* Store */\n      const cellIdStr = CellIdStr(dnaId, agentId);\n      if (!this._networkInfoLogs[cellIdStr]) {\n        this._networkInfoLogs[cellIdStr] = [];\n      }\n      this._networkInfoLogs[cellIdStr].push([this._lastTimeQueriedMap.get(agentId), netInfo])\n      /* */\n      i += 1;\n    }\n    return response;\n  }\n\n\n\n  /** Store networkInfo calls */\n  //private _lastTimeQueriedMap: Record<AgentPubKeyB64, Timestamp> = {};\n  private _lastTimeQueriedMap: AgentIdMap<Timestamp> = new AgentIdMap();\n\n  private _networkInfoLogs: Record<CellIdStr, [Timestamp, NetworkInfo][]> = {};\n\n  get networkInfoLogs(): Record<CellIdStr, [Timestamp, NetworkInfo][]> {return this._networkInfoLogs;}\n\n\n\n/** -- Creation -- */\n\n  /** async Factory */\n  static async new(port_or_socket: number | AppWebsocket, appId: InstalledAppId, adminUrl?: URL, defaultTimeout?: number): Promise<ConductorAppProxy> {\n    const timeout = defaultTimeout ? defaultTimeout : 10 * 1000;\n    if (typeof port_or_socket == 'object') {\n      return  ConductorAppProxy.fromSocket(port_or_socket, timeout);\n    } else {\n      let wsUrl = new URL(`ws://localhost:${port_or_socket}`);\n      try {\n        let token;\n        let adminWs: AdminWebsocket;\n        if (adminUrl) {\n          adminWs = await AdminWebsocket.connect({url: adminUrl});\n          console.log({adminWs});\n          const issued = await adminWs.issueAppAuthenticationToken({installed_app_id: appId});\n          token = issued.token;\n        }\n        const appWs = await AppWebsocket.connect({url: wsUrl, defaultTimeout: timeout, token});\n        let conductor = new ConductorAppProxy(timeout, appId, new AgentId(appWs.myPubKey), adminWs);\n        conductor._appWs = appWs;\n        conductor._appWs.on('signal', (sig) => {conductor.onSignal(sig)});\n        return conductor;\n      } catch (e) {\n        console.error(\"ConductorAppProxy initialization failed\", e)\n        return Promise.reject(\"ConductorAppProxy initialization failed\");\n      }\n    }\n  }\n\n\n  /** */\n  private static async fromSocket(appWebsocket: AppWebsocket, defaultTimeout: number): Promise<ConductorAppProxy> {\n    try {\n      let conductor = new ConductorAppProxy(defaultTimeout, appWebsocket.installedAppId, new AgentId(appWebsocket.myPubKey));\n      conductor._appWs = appWebsocket;\n      conductor._appWs.on('signal', (sig) => {conductor.onSignal(sig)})\n      return conductor;\n    } catch (e) {\n      console.error(\"ConductorAppProxy initialization failed\", e)\n      return Promise.reject(\"ConductorAppProxy initialization failed\");\n    }\n  }\n\n\n  /** Ctor */\n  /*protected*/ constructor(public defaultTimeout: number, appId: InstalledAppId, agentId: AgentId, adminWs?: AdminWebsocket) {\n    super(defaultTimeout, appId, agentId, adminWs);\n  }\n\n}\n\n"]}
+{"version":3,"file":"ConductorAppProxy.js","sourceRoot":"","sources":["../src/ConductorAppProxy.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  AppInfoResponse,\n  AppWebsocket,\n  CallZomeRequest,\n  InstalledAppId,\n  CreateCloneCellRequest,\n  DisableCloneCellRequest,\n  EnableCloneCellRequest,\n  ClonedCell,\n  NetworkInfo,\n  NetworkInfoRequest,\n  Timestamp,\n  AppClient,\n  AppEvents,\n  AppSignalCb,\n  AppNetworkInfoRequest,\n  NetworkInfoResponse,\n  AdminWebsocket,\n} from \"@holochain/client\";\nimport { UnsubscribeFunction } from \"emittery\";\nimport {AppProxy} from \"./AppProxy\";\nimport {CellAddress, CellIdStr} from \"./types\";\nimport {AgentId, DnaId} from \"./hash\";\nimport {AgentIdMap} from \"./holochain-id-map\";\n\n\n/**\n * Creates, connects and holds an appWebsocket.\n * Creates and holds Cell proxies for this appWebsocket.\n * Maintains a mapping between CellIds and HCLs\n * Handles SignalHandlers per HCL\n * Stores appSignal logs\n * TODO Implement Singleton per App port?\n */\nexport class ConductorAppProxy extends AppProxy implements AppClient {\n\n  /** -- Fields -- */\n\n  private _appWs!: AppWebsocket;\n\n\n  /** -- Getters -- */\n\n  ///** Check this after connecting since AppWebsocket can shamelessly override the provided args. */\n  //get appIdOfShame(): InstalledAppId | undefined { return this._appWs.overrideInstalledAppId;}\n\n\n  /** -- AppClient (Passthrough to appWebsocket) -- */\n\n  async callZome(req: CallZomeRequest, timeout?: number): Promise<unknown> {\n    timeout = timeout ? timeout : this.defaultTimeout\n    return this._appWs.callZome(req, timeout)\n  }\n\n  async appInfo(): Promise<AppInfoResponse> {\n    return this._appWs!.appInfo();\n  }\n\n  on<Name extends keyof AppEvents>(\n    eventName: Name | readonly Name[],\n    listener: AppSignalCb\n  ): UnsubscribeFunction {\n    return this._appWs!.on(eventName, listener);\n  }\n\n  async createCloneCell(request: CreateCloneCellRequest): Promise<ClonedCell> {\n    //console.log(\"createCloneCell() called:\", request)\n    return this._appWs!.createCloneCell(request);\n  }\n\n  async enableCloneCell(request: EnableCloneCellRequest): Promise<ClonedCell> {\n    //console.log(\"enableCloneCell() called:\", request)\n    return this._appWs!.enableCloneCell(request);\n  }\n\n  async disableCloneCell(request: DisableCloneCellRequest): Promise<void> {\n    //console.log(\"disableCloneCell() called:\", request)\n    return this._appWs!.disableCloneCell(request);\n  }\n\n  // async networkInfo(args: AppNetworkInfoRequest): Promise<NetworkInfoResponse> {\n  //   return this._appWs!.networkInfo(args);\n  // }\n\n\n  /** */\n  async networkInfo(args: AppNetworkInfoRequest): Promise<NetworkInfoResponse> {\n    //const agent = encodeHashToBase64();\n    const agentId = new AgentId(this._appWs.myPubKey);\n    /* Call networkInfo */\n    const response = await this._appWs.networkInfo({\n      dnas: args.dnas,\n      last_time_queried: this._lastTimeQueriedMap.get(agentId)\n    } as NetworkInfoRequest);\n    this._lastTimeQueriedMap.set(agentId, Date.now());\n\n    /* Convert result */\n    let i = 0;\n    //let result = {}\n    for (const netInfo of response) {\n      const dnaId = new DnaId(args.dnas[i]);\n      //result[dnaHash] = [this._lastTimeQueriedMap[agent], netInfo];\n      /* Store */\n      const cellAddr = new CellAddress(dnaId, agentId);\n      if (!this._networkInfoLogs[cellAddr.str]) {\n        this._networkInfoLogs[cellAddr.str] = [];\n      }\n      this._networkInfoLogs[cellAddr.str].push([this._lastTimeQueriedMap.get(agentId), netInfo])\n      /* */\n      i += 1;\n    }\n    return response;\n  }\n\n\n\n  /** Store networkInfo calls */\n  //private _lastTimeQueriedMap: Record<AgentPubKeyB64, Timestamp> = {};\n  private _lastTimeQueriedMap: AgentIdMap<Timestamp> = new AgentIdMap();\n\n  private _networkInfoLogs: Record<CellIdStr, [Timestamp, NetworkInfo][]> = {};\n\n  get networkInfoLogs(): Record<CellIdStr, [Timestamp, NetworkInfo][]> {return this._networkInfoLogs;}\n\n\n\n/** -- Creation -- */\n\n  /** async Factory */\n  static async new(port_or_socket: number | AppWebsocket, appId: InstalledAppId, adminUrl?: URL, defaultTimeout?: number): Promise<ConductorAppProxy> {\n    const timeout = defaultTimeout ? defaultTimeout : 10 * 1000;\n    if (typeof port_or_socket == 'object') {\n      return  ConductorAppProxy.fromSocket(port_or_socket, timeout);\n    } else {\n      let wsUrl = new URL(`ws://localhost:${port_or_socket}`);\n      try {\n        let token;\n        let adminWs: AdminWebsocket;\n        if (adminUrl) {\n          adminWs = await AdminWebsocket.connect({url: adminUrl});\n          console.log({adminWs});\n          const issued = await adminWs.issueAppAuthenticationToken({installed_app_id: appId});\n          token = issued.token;\n        }\n        const appWs = await AppWebsocket.connect({url: wsUrl, defaultTimeout: timeout, token});\n        let conductor = new ConductorAppProxy(timeout, appId, new AgentId(appWs.myPubKey), adminWs);\n        conductor._appWs = appWs;\n        conductor._appWs.on('signal', (sig) => {conductor.onSignal(sig)});\n        return conductor;\n      } catch (e) {\n        console.error(\"ConductorAppProxy initialization failed\", e)\n        return Promise.reject(\"ConductorAppProxy initialization failed\");\n      }\n    }\n  }\n\n\n  /** */\n  private static async fromSocket(appWebsocket: AppWebsocket, defaultTimeout: number): Promise<ConductorAppProxy> {\n    try {\n      let conductor = new ConductorAppProxy(defaultTimeout, appWebsocket.installedAppId, new AgentId(appWebsocket.myPubKey));\n      conductor._appWs = appWebsocket;\n      conductor._appWs.on('signal', (sig) => {conductor.onSignal(sig)})\n      return conductor;\n    } catch (e) {\n      console.error(\"ConductorAppProxy initialization failed\", e)\n      return Promise.reject(\"ConductorAppProxy initialization failed\");\n    }\n  }\n\n\n  /** Ctor */\n  /*protected*/ constructor(public defaultTimeout: number, appId: InstalledAppId, agentId: AgentId, adminWs?: AdminWebsocket) {\n    super(defaultTimeout, appId, agentId, adminWs);\n  }\n\n}\n\n"]}

package/dist/cell.d.ts

@@ -1,9 +1,7 @@
-import { CellId, CellInfo, DnaModifiers, ProvisionedCell, StemCell, ClonedCell, InstalledAppId } from "@holochain/client";
+import { CellInfo, DnaModifiers, ProvisionedCell, StemCell, ClonedCell, InstalledAppId } from "@holochain/client";
 import { RoleName } from "@holochain/client/lib/types";
 import { HCL } from "./hcl";
-import { BaseRoleName } from "./types";
-import { AgentId, DnaId } from "./hash";
-export type AnyCell = ProvisionedCell | ClonedCell;
+import { AnyCell, BaseRoleName, CellAddress } from "./types";
 /**
  * Common interface between Provisioned and Cloned cells
  */
@@ -13,12 +11,11 @@ export declare class Cell {
     readonly baseRoleName: BaseRoleName;
     /** */
     static from(cellInfo: CellInfo, appId: InstalledAppId, baseRoleName: BaseRoleName): Cell;
+    private readonly _address;
     /** Ctor */
     constructor(_cell: AnyCell, appId: InstalledAppId, baseRoleName: BaseRoleName);
     /** -- Getters -- */
-    get id(): CellId;
-    get dnaId(): DnaId;
-    get agentId(): AgentId;
+    get address(): CellAddress;
     get name(): string;
     get dnaModifiers(): DnaModifiers;
     /** ex: rNamedInteger.0 */

package/dist/cell.js

@@ -1,6 +1,7 @@
-import { CellType } from "@holochain/client";
+import { CellType, } from "@holochain/client";
 import { HCL } from "./hcl";
-import { AgentId, DnaId, enc64 } from "./hash";
+import { CellAddress } from "./types";
+import { enc64 } from "./hash";
 /**
  * Common interface between Provisioned and Cloned cells
  */
@@ -21,11 +22,13 @@ export class Cell {
         this._cell = _cell;
         this.appId = appId;
         this.baseRoleName = baseRoleName;
+        this._address = CellAddress.from(this._cell.cell_id);
     }
     /** -- Getters -- */
-    get id() { return this._cell.cell_id; }
-    get dnaId() { return new DnaId(this.id[0]); }
-    get agentId() { return new AgentId(this.id[1]); }
+    //get id(): CellId { return (this._cell as any).cell_id }
+    //get dnaId(): DnaId { return new DnaId(this.id[0]) }
+    //get agentId(): AgentId { return new AgentId(this.id[1]) }
+    get address() { return this._address; }
     get name() { return this._cell.name; }
     get dnaModifiers() { return this._cell.dna_modifiers; }
     /** ex: rNamedInteger.0 */
@@ -46,7 +49,7 @@ export class Cell {
     }
     /** */
     print() {
-        return `Cell "${this.name}${this.cloneId ? "." + this.cloneId : ""}": ${this.dnaId.short}`;
+        return `Cell "${this.name}${this.cloneId ? "." + this.cloneId : ""}": ${this._address.dnaId.short}`;
     }
 }
 /** ... */

package/dist/cell.js.map

@@ -1 +1 @@
-{"version":3,"file":"cell.js","sourceRoot":"","sources":["../src/cell.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  CellId,\n  CellInfo,\n  CellType,\n  DnaModifiers,\n  ProvisionedCell, StemCell, ClonedCell, InstalledAppId\n} from \"@holochain/client\";\nimport {RoleName} from \"@holochain/client/lib/types\";\nimport {HCL} from \"./hcl\";\nimport {BaseRoleName} from \"./types\";\nimport {AgentId, DnaId, enc64} from \"./hash\";\n\n\nexport type AnyCell = ProvisionedCell | ClonedCell;\n\n\n/**\n * Common interface between Provisioned and Cloned cells\n */\nexport class Cell {\n\n  /** */\n  static from(cellInfo: CellInfo, appId: InstalledAppId, baseRoleName: BaseRoleName): Cell {\n    if (CellType.Stem in cellInfo) {\n      const id = cellInfo.stem.name? cellInfo.stem.name : enc64(cellInfo.stem.dna);\n      throw Error(\"StemCell cannot be converted to Cell: \" + id);\n    }\n    if (CellType.Cloned in cellInfo) {\n      return new Cell(cellInfo.cloned, appId, baseRoleName);\n    }\n    return new Cell(cellInfo.provisioned, appId, baseRoleName);\n  }\n\n\n  /** Ctor */\n  constructor(private readonly _cell: AnyCell, public readonly appId: InstalledAppId, public readonly baseRoleName: BaseRoleName) {}\n\n\n  /** -- Getters -- */\n\n  get id(): CellId { return (this._cell as any).cell_id }\n  get dnaId(): DnaId { return new DnaId(this.id[0]) }\n  get agentId(): AgentId { return new AgentId(this.id[1]) }\n  get name(): string {return (this._cell as any).name}\n  get dnaModifiers(): DnaModifiers {return (this._cell as any).dna_modifiers}\n\n  /** ex: rNamedInteger.0 */\n  get cloneId(): RoleName | undefined { return (this._cell as any).clone_id }\n\n\n  /** -- Methods -- */\n\n  hcl(): HCL {return new HCL(this.appId, this.baseRoleName, this.cloneId)}\n\n  asCloned(): ClonedCell | null {\n    if (!this.cloneId) { return null}\n    return this._cell as ClonedCell;\n  }\n\n  asProvisioned(): ProvisionedCell | null {\n    if (this.cloneId) { return null}\n    return this._cell as ProvisionedCell;\n  }\n\n  /** */\n  print(): string {\n    return `Cell \"${this.name}${this.cloneId? \".\" + this.cloneId: \"\"}\": ${this.dnaId.short}`;\n  }\n}\n\n\n\n/** ... */\nexport function intoStem(cellInfo: CellInfo): StemCell | undefined {\n  if (CellType.Stem in cellInfo) {\n    return cellInfo.stem;\n  }\n  return undefined\n}\n\n/** ... */\nexport function asCell(cellInfo: CellInfo): AnyCell | undefined {\n  if (CellType.Stem in cellInfo) {\n    return undefined;\n  }\n  if (CellType.Cloned in cellInfo) {\n    return cellInfo.cloned;\n  }\n  if (CellType.Provisioned in cellInfo) {\n    return cellInfo.provisioned;\n  }\n  return undefined;\n}\n"]}
+{"version":3,"file":"cell.js","sourceRoot":"","sources":["../src/cell.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  CellInfo,\n  CellType,\n  DnaModifiers,\n  ProvisionedCell, StemCell, ClonedCell, InstalledAppId,\n} from \"@holochain/client\";\nimport {RoleName} from \"@holochain/client/lib/types\";\nimport {HCL} from \"./hcl\";\nimport {AnyCell, BaseRoleName, CellAddress} from \"./types\";\nimport {enc64} from \"./hash\";\n\n\n\n/**\n * Common interface between Provisioned and Cloned cells\n */\nexport class Cell {\n\n  /** */\n  static from(cellInfo: CellInfo, appId: InstalledAppId, baseRoleName: BaseRoleName): Cell {\n    if (CellType.Stem in cellInfo) {\n      const id = cellInfo.stem.name? cellInfo.stem.name : enc64(cellInfo.stem.dna);\n      throw Error(\"StemCell cannot be converted to Cell: \" + id);\n    }\n    if (CellType.Cloned in cellInfo) {\n      return new Cell(cellInfo.cloned, appId, baseRoleName);\n    }\n    return new Cell(cellInfo.provisioned, appId, baseRoleName);\n  }\n\n  private readonly _address: CellAddress;\n\n  /** Ctor */\n  constructor(private readonly _cell: AnyCell, public readonly appId: InstalledAppId, public readonly baseRoleName: BaseRoleName) {\n    this._address = CellAddress.from((this._cell as any).cell_id);\n  }\n\n\n  /** -- Getters -- */\n\n  //get id(): CellId { return (this._cell as any).cell_id }\n  //get dnaId(): DnaId { return new DnaId(this.id[0]) }\n  //get agentId(): AgentId { return new AgentId(this.id[1]) }\n\n  get address(): CellAddress { return this._address; }\n\n  get name(): string {return (this._cell as any).name}\n  get dnaModifiers(): DnaModifiers {return (this._cell as any).dna_modifiers}\n\n  /** ex: rNamedInteger.0 */\n  get cloneId(): RoleName | undefined { return (this._cell as any).clone_id }\n\n\n  /** -- Methods -- */\n\n  hcl(): HCL {return new HCL(this.appId, this.baseRoleName, this.cloneId)}\n\n  asCloned(): ClonedCell | null {\n    if (!this.cloneId) { return null}\n    return this._cell as ClonedCell;\n  }\n\n  asProvisioned(): ProvisionedCell | null {\n    if (this.cloneId) { return null}\n    return this._cell as ProvisionedCell;\n  }\n\n  /** */\n  print(): string {\n    return `Cell \"${this.name}${this.cloneId? \".\" + this.cloneId: \"\"}\": ${this._address.dnaId.short}`;\n  }\n}\n\n\n\n/** ... */\nexport function intoStem(cellInfo: CellInfo): StemCell | undefined {\n  if (CellType.Stem in cellInfo) {\n    return cellInfo.stem;\n  }\n  return undefined\n}\n\n/** ... */\nexport function asCell(cellInfo: CellInfo): AnyCell | undefined {\n  if (CellType.Stem in cellInfo) {\n    return undefined;\n  }\n  if (CellType.Cloned in cellInfo) {\n    return cellInfo.cloned;\n  }\n  if (CellType.Provisioned in cellInfo) {\n    return cellInfo.provisioned;\n  }\n  return undefined;\n}\n"]}

package/dist/hash.d.ts

@@ -1,8 +1,10 @@
-import { HoloHash, HoloHashB64 } from "@holochain/client";
+import { ExtensionCodec } from "@msgpack/msgpack";
+import { HoloHashB64 } from "@holochain/client";
 /**
  * Checks if obj is a Hash or list of hashes and tries to convert it a B64 or list of B64
  */
 export declare function anyToB64(obj: any): any;
+export declare function dhtLocationFrom32(hashCore: Uint8Array): Uint8Array;
 /** ------------------------------------------------------------------------------------------------------------------*/
 export declare enum HoloHashType {
     Action = "Action",
@@ -28,23 +30,25 @@ export declare function isHashTypeB64(hash: HoloHashB64, hashType: HoloHashType)
 export declare function hasHoloHashType(hash: HoloHashB64): boolean;
 /** */
 export declare function validateHashB64(hash: HoloHashB64, hashType?: HoloHashType): void;
-export declare function dec64(hash: HoloHashB64): HoloHash;
-export declare function enc64(hash: HoloHash): HoloHashB64;
+export declare function dec64(hash: HoloHashB64): Uint8Array;
+export declare function enc64(hash: Uint8Array): HoloHashB64;
 /** A HoloHash starts with 'u' has a type and is 53 chars long */
 export declare abstract class HolochainId {
     readonly b64: HoloHashB64;
     static readonly HASH_TYPE: HoloHashType;
     get hashType(): HoloHashType;
     /** ctor: validate */
-    constructor(input: HoloHashB64 | HoloHash);
+    constructor(input: HoloHashB64 | Uint8Array);
     /** */
-    static empty<T extends HolochainId>(this: new (input: HoloHashB64 | HoloHash) => T, byte?: number): T;
+    equals<T extends HolochainId>(other: T | Uint8Array | string): boolean;
     /** */
-    static from<T extends HolochainId, Z extends HolochainId>(this: new (input: HoloHashB64 | HoloHash) => Z, start: T): Z;
+    static empty<T extends HolochainId>(this: new (input: HoloHashB64 | Uint8Array) => T, byte?: number): T;
     /** */
-    static random<T extends HolochainId>(this: new (input: HoloHashB64 | HoloHash) => T): Promise<T>;
+    static from<T extends HolochainId, Z extends HolochainId>(this: new (input: HoloHashB64 | Uint8Array) => Z, start: T): Z;
+    /** */
+    static random<T extends HolochainId>(this: new (input: HoloHashB64 | Uint8Array) => T): Promise<T>;
     toString(): string;
-    get hash(): HoloHash;
+    get hash(): Uint8Array;
     /** First 8 chars of the Core */
     get short(): string;
     print(): string;
@@ -73,8 +77,11 @@ export type DhtId = ActionId | EntryId;
 export type LinkableId = DhtId | ExternalId;
 export type AnyId = LinkableId | AgentId | DnaId;
 /** */
-export declare function intoDhtId(input: HoloHashB64 | HoloHash): DhtId;
+export declare function intoDhtId(input: HoloHashB64 | Uint8Array): DhtId;
 /** */
-export declare function intoLinkableId(input: HoloHashB64 | HoloHash): LinkableId;
+export declare function intoLinkableId(input: HoloHashB64 | Uint8Array): LinkableId;
+/** -- MsgPack ExtensionCodec for HolochainId -- */
+export declare const HOLOCHAIN_ID_EXT_CODEC: ExtensionCodec<undefined>;
+/** -- TESTING -- */
 /** */
 export declare function testHoloId(): Promise<void>;

package/dist/hash.js

@@ -1,11 +1,15 @@
-import { decodeHashFromBase64, dhtLocationFrom32, encodeHashToBase64, HASH_TYPE_PREFIX, randomByteArray, } from "@holochain/client";
+import { decode, encode, ExtensionCodec } from "@msgpack/msgpack";
+import blake2b from "@bitgo/blake2b";
+import { Base64 } from "js-base64";
+import { HASH_TYPE_PREFIX, randomByteArray, } from "@holochain/client";
+import { getIndexByVariant } from "./utils";
 /**
  * Checks if obj is a Hash or list of hashes and tries to convert it a B64 or list of B64
  */
 export function anyToB64(obj) {
     /** Check if it's a hash */
     if (obj instanceof Uint8Array) {
-        return encodeHashToBase64(obj);
+        return enc64(obj);
     }
     else {
         /** Check if it's an array of hashes */
@@ -17,7 +21,7 @@ export function anyToB64(obj) {
             if (isUint8Array) {
                 let result = [];
                 for (const cur of obj) {
-                    result.push(encodeHashToBase64(cur));
+                    result.push(enc64(cur));
                 }
                 return result;
             }
@@ -26,6 +30,25 @@ export function anyToB64(obj) {
     return obj;
 }
 /** ------------------------------------------------------------------------------------------------------------------*/
+function decodeHashFromBase64(hash) {
+    return Base64.toUint8Array(hash.slice(1));
+}
+function encodeHashToBase64(hash) {
+    return `u${Base64.fromUint8Array(hash, true)}`;
+}
+export function dhtLocationFrom32(hashCore) {
+    const hash = new Uint8Array(16);
+    blake2b(hash.length).update(hashCore).digest(hash);
+    const out = hash.slice(0, 4);
+    [4, 8, 12].forEach((i) => {
+        out[0] ^= hash[i];
+        out[1] ^= hash[i + 1];
+        out[2] ^= hash[i + 2];
+        out[3] ^= hash[i + 3];
+    });
+    return out;
+}
+/** ------------------------------------------------------------------------------------------------------------------*/
 export var HoloHashType;
 (function (HoloHashType) {
     HoloHashType["Action"] = "Action";
@@ -82,7 +105,7 @@ export function validateHashB64(hash, hashType) {
         throw new Error("The hash must be exactly 53 characters long. Got: " + hash.length);
     }
     if ((hashType && !isHashTypeB64(hash, hashType)) || !hasHoloHashType(hash)) {
-        throw new Error("The hash must have a valid HoloHash type.");
+        throw new Error("The hash must have a valid HoloHashB64 type.");
     }
 }
 export function dec64(hash) {
@@ -94,6 +117,9 @@ export function enc64(hash) {
     validateHashB64(b64);
     return b64;
 }
+function isUint8Array(value) {
+    return value instanceof Uint8Array;
+}
 /** A HoloHash starts with 'u' has a type and is 53 chars long */
 export class HolochainId {
     get hashType() {
@@ -108,6 +134,26 @@ export class HolochainId {
         this.b64 = input;
     }
     /** */
+    equals(other) {
+        //console.log("equals", other, isUint8Array(other));
+        if (!other) {
+            return false;
+        }
+        let b64;
+        if (typeof (other) == 'string') {
+            b64 = other;
+        }
+        else {
+            if (isUint8Array(other)) {
+                b64 = enc64(other);
+            }
+            else {
+                b64 = other.b64;
+            }
+        }
+        return b64 == this.b64;
+    }
+    /** */
     static empty(byte) {
         const empty = new Uint8Array(32);
         byte = byte ? byte : 0;
@@ -190,6 +236,69 @@ export function intoLinkableId(input) {
         return externalId;
     }
 }
+/** -- MsgPack ExtensionCodec for HolochainId -- */
+export const HOLOCHAIN_ID_EXT_CODEC = new ExtensionCodec();
+HOLOCHAIN_ID_EXT_CODEC.register({
+    type: getIndexByVariant(HoloHashType, HoloHashType.Agent),
+    encode: (object) => {
+        if (object instanceof AgentId) {
+            return encode(object.b64);
+        }
+        else {
+            return null;
+        }
+    },
+    decode: (data) => {
+        const b64 = decode(data);
+        return new AgentId(b64);
+    },
+});
+HOLOCHAIN_ID_EXT_CODEC.register({
+    type: getIndexByVariant(HoloHashType, HoloHashType.Entry),
+    encode: (object) => {
+        if (object instanceof EntryId) {
+            return encode(object.b64);
+        }
+        else {
+            return null;
+        }
+    },
+    decode: (data) => {
+        const b64 = decode(data);
+        return new EntryId(b64);
+    },
+});
+HOLOCHAIN_ID_EXT_CODEC.register({
+    type: getIndexByVariant(HoloHashType, HoloHashType.Action),
+    encode: (object) => {
+        if (object instanceof ActionId) {
+            return encode(object.b64);
+        }
+        else {
+            return null;
+        }
+    },
+    decode: (data) => {
+        const b64 = decode(data);
+        return new ActionId(b64);
+    },
+});
+HOLOCHAIN_ID_EXT_CODEC.register({
+    type: getIndexByVariant(HoloHashType, HoloHashType.Dna),
+    encode: (object) => {
+        if (object instanceof DnaId) {
+            return encode(object.b64);
+        }
+        else {
+            return null;
+        }
+    },
+    decode: (data) => {
+        const b64 = decode(data);
+        return new DnaId(b64);
+    },
+});
+/** -- TESTING -- */
 /** */
 export async function testHoloId() {
     console.log("testHoloId()");
@@ -206,6 +315,9 @@ export async function testHoloId() {
     printEh(emptyEntry);
     printEh(emptyEntry2);
     printEh(randomEh);
+    console.log("testHoloId.emptyEntry", emptyEntry.equals(emptyEntry), emptyEntry.equals(emptyEntry.b64), emptyEntry.equals(emptyEntry.hash));
+    console.log("testHoloId.emptyEntry2", emptyEntry.equals(emptyEntry2), emptyEntry.equals(emptyEntry2.b64), emptyEntry.equals(emptyEntry2.hash));
+    console.log("testHoloId.randomEh", emptyEntry.equals(randomEh), emptyEntry.equals(emptyAgent), emptyEntry.equals(emptyAgent.hash), emptyEntry.equals(emptyAgent.b64));
     //printEh(emptyAction); // Should error at compile time
 }
 //# sourceMappingURL=hash.js.map

package/dist/hash.js.map

@@ -1 +1 @@
-{"version":3,"file":"hash.js","sourceRoot":"","sources":["../src/hash.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  decodeHashFromBase64,\n  dhtLocationFrom32,\n  encodeHashToBase64, HASH_TYPE_PREFIX,\n  HoloHash,\n  HoloHashB64, randomByteArray,\n} from \"@holochain/client\";\n\n/**\n * Checks if obj is a Hash or list of hashes and tries to convert it a B64 or list of B64\n */\nexport function anyToB64(obj: any): any {\n  /** Check if it's a hash */\n  if (obj instanceof Uint8Array) {\n    return encodeHashToBase64(obj);\n  } else {\n    /** Check if it's an array of hashes */\n    if (Array.isArray(obj)) {\n      const isUint8Array =\n        obj.length > 0 &&\n        obj.every((value) => {\n          return value instanceof Uint8Array;\n        });\n      if (isUint8Array) {\n        let result = [];\n        for (const cur of obj) {\n          result.push(encodeHashToBase64(cur));\n        }\n        return result;\n      }\n    }\n  }\n  return obj;\n}\n\n\n/** ------------------------------------------------------------------------------------------------------------------*/\n\nexport enum HoloHashType {\n  Action = \"Action\",\n  Agent = \"Agent\",\n  //DhtOp = \"DhtOp\",\n  Dna = \"Dna\",\n  Entry = \"Entry\",\n  External = \"External\",\n  Network = \"Network\",\n  //Warrent = \"Warrent\",\n  Wasm = \"Wasm\",\n}\n\nexport const HASH_TYPE_PREFIX_B64 = {\n  Action: \"uhCkk\",\n  Agent: \"uhCAk\",\n  Dna: \"uhC0k\",\n  //DhtOp: \"hCQk\",\n  Entry: \"uhCEk\",\n  External: \"uhC8k\",\n  Network: \"uhCIk\",\n  //Warrent: \"Warrent\",\n  Wasm: \"uhCok\",\n};\n\nexport function getHashType(hash: HoloHashB64): HoloHashType {\n  const hashExt = hash.slice(0, 5);\n  const hashPrefixes = Object.values(HASH_TYPE_PREFIX_B64)\n  for (let i = 0; i < hashPrefixes.length; i+= 1) {\n    if (hashPrefixes[i] == hashExt) {\n      return Object.keys(HASH_TYPE_PREFIX_B64)[i] as HoloHashType;\n    }\n  }\n  throw Error(\"Unknown hash type\");\n}\n\n\n/** */\nexport function isHashTypeB64(hash: HoloHashB64, hashType: HoloHashType) {\n  const slice = hash.slice(0, 5);\n  const prefix = HASH_TYPE_PREFIX_B64[hashType];\n  for (let i = 0; i < prefix.length; i++) {\n    if (slice[i] !== prefix[i]) {\n      return false;\n    }\n  }\n  return true;\n}\n\n\nexport function hasHoloHashType(hash: HoloHashB64): boolean {\n  return !!Object.values(HASH_TYPE_PREFIX_B64).find((prefix) => hash.startsWith(`${prefix}`));\n}\n\n\n/** */\nexport function validateHashB64(hash: HoloHashB64, hashType?: HoloHashType) {\n  if (!hash || typeof(hash) != 'string') {\n    throw new Error(\"The hash must be a valid string\");\n  }\n  if (hash.length !== 53) {\n    throw new Error(\"The hash must be exactly 53 characters long. Got: \" + hash.length);\n  }\n  if((hashType && !isHashTypeB64(hash, hashType)) || !hasHoloHashType(hash)) {\n    throw new Error(\"The hash must have a valid HoloHash type.\");\n  }\n}\n\n\nexport function dec64(hash: HoloHashB64): HoloHash {\n  validateHashB64(hash);\n  return decodeHashFromBase64(hash);\n}\n\nexport function enc64(hash: HoloHash): HoloHashB64 {\n  let b64 = encodeHashToBase64(hash);\n  validateHashB64(b64);\n  return b64;\n}\n\n\n\n/** A HoloHash starts with 'u' has a type and is 53 chars long */\nexport abstract class HolochainId {\n  public readonly b64: HoloHashB64;\n\n  static readonly HASH_TYPE: HoloHashType;\n\n  get hashType(): HoloHashType {\n    return (this.constructor as typeof HolochainId).HASH_TYPE;\n  }\n\n  /** ctor: validate */\n  constructor(input: HoloHashB64 | HoloHash) {\n    if (typeof(input) != 'string') {\n      input = encodeHashToBase64(input);\n    }\n    validateHashB64(input, this.hashType);\n    this.b64 = input;\n  }\n\n  /** */\n  static empty<T extends HolochainId>(this: new (input: HoloHashB64 | HoloHash) => T, byte?: number): T {\n    const empty = new Uint8Array(32);\n    byte = byte? byte : 0;\n    empty.fill(byte);\n    const newHash = Uint8Array.from([\n      ...HASH_TYPE_PREFIX[(this as unknown as typeof HolochainId).HASH_TYPE],\n      ...empty,\n      ...dhtLocationFrom32(empty),\n    ]);\n    return new this(newHash);\n  }\n\n  /** */\n  static from<T extends HolochainId, Z extends HolochainId>(this: new (input: HoloHashB64 | HoloHash) => Z, start: T): Z {\n    const core = Uint8Array.from(start.hash.slice(3, 35));\n    const hashType = (this as unknown as typeof HolochainId).HASH_TYPE;\n    const newHash = Uint8Array.from([\n      ...HASH_TYPE_PREFIX[hashType],\n      ...core,\n      ...dhtLocationFrom32(core),\n    ]);\n    return new this(newHash);\n  }\n\n\n  /** */\n  static async random<T extends HolochainId>(this: new (input: HoloHashB64 | HoloHash) => T): Promise<T> {\n    const core = await randomByteArray(32);\n    const newHash = Uint8Array.from([\n      ...HASH_TYPE_PREFIX[(this as unknown as typeof HolochainId).HASH_TYPE],\n      ...core,\n      ...dhtLocationFrom32(core),\n    ]);\n    return new this(newHash);\n  }\n\n\n  // Don't autoconvert to string as this can lead to confusions. Have convert to string be explicit\n  toString(): string {throw Error(\"Implicit conversion of HolochainId to string\")}\n\n  //toString(): string {return this.b64;}\n\n  get hash(): HoloHash { return dec64(this.b64) }\n  /** First 8 chars of the Core */\n  get short(): string { return this.b64.slice(5, 13); }\n\n  print(): string { return `${this.short} (${this.hashType})`}\n}\n\n\nexport class ActionId extends HolochainId { static readonly HASH_TYPE = HoloHashType.Action; action() {} }\nexport class AgentId extends HolochainId { static readonly HASH_TYPE = HoloHashType.Agent; agent() {} }\nexport class EntryId extends HolochainId { static readonly HASH_TYPE = HoloHashType.Entry; entry() {} }\nexport class DnaId extends HolochainId { static readonly HASH_TYPE = HoloHashType.Dna; dna() {} }\nexport class ExternalId extends HolochainId { static readonly HASH_TYPE = HoloHashType.External; external() {} }\n\n//export class AnyId extends HolochainId { static readonly HASH_TYPE = HoloHashType.Any; any() {} }\n\nexport type DhtId = ActionId | EntryId;\nexport type LinkableId = DhtId | ExternalId;\nexport type AnyId = LinkableId | AgentId | DnaId;\n\n\n/** */\nexport function intoDhtId(input: HoloHashB64 | HoloHash): DhtId {\n  try {\n    const actionId = new ActionId(input);\n    return actionId;\n  } catch(e) {\n      const entryId = new EntryId(input);\n      return entryId;\n  }\n}\n\n\n/** */\nexport function intoLinkableId(input: HoloHashB64 | HoloHash): LinkableId {\n  try {\n    const dhtId = intoDhtId(input);\n    return dhtId;\n  } catch(e) {\n    const externalId = new ExternalId(input);\n    return externalId;\n  }\n}\n\n\n/** */\nexport async function testHoloId() {\n  console.log(\"testHoloId()\");\n  const emptyAction = ActionId.empty();\n  const emptyEntry = EntryId.empty();\n  const emptyAgent = AgentId.from(emptyEntry);\n  const emptyEntry2 = EntryId.from(emptyAgent);\n  const randomEh = await EntryId.random();\n\n  console.log(\"testHoloId()\", emptyAction);\n  /** */\n  function printEh(eh: EntryId) {\n    console.log(\"printEh\", eh);\n  }\n\n  printEh(emptyEntry);\n  printEh(emptyEntry2);\n  printEh(randomEh);\n  //printEh(emptyAction); // Should error at compile time\n}\n\n"]}
+{"version":3,"file":"hash.js","sourceRoot":"","sources":["../src/hash.ts"],"names":[],"mappings":"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","sourcesContent":["import {decode, encode, ExtensionCodec} from \"@msgpack/msgpack\";\nimport blake2b from \"@bitgo/blake2b\";\nimport { Base64 } from \"js-base64\";\nimport {\n  ActionHashB64,\n  AgentPubKeyB64,\n  EntryHashB64, HASH_TYPE_PREFIX,\n  HoloHashB64, randomByteArray,\n} from \"@holochain/client\";\nimport {getIndexByVariant} from \"./utils\";\n\n\n/**\n * Checks if obj is a Hash or list of hashes and tries to convert it a B64 or list of B64\n */\nexport function anyToB64(obj: any): any {\n  /** Check if it's a hash */\n  if (obj instanceof Uint8Array) {\n    return enc64(obj);\n  } else {\n    /** Check if it's an array of hashes */\n    if (Array.isArray(obj)) {\n      const isUint8Array =\n        obj.length > 0 &&\n        obj.every((value) => {\n          return value instanceof Uint8Array;\n        });\n      if (isUint8Array) {\n        let result = [];\n        for (const cur of obj) {\n          result.push(enc64(cur));\n        }\n        return result;\n      }\n    }\n  }\n  return obj;\n}\n\n\n/** ------------------------------------------------------------------------------------------------------------------*/\n\nfunction decodeHashFromBase64(hash: HoloHashB64): Uint8Array {\n  return Base64.toUint8Array(hash.slice(1));\n}\n\n\nfunction encodeHashToBase64(hash: Uint8Array): HoloHashB64 {\n  return `u${Base64.fromUint8Array(hash, true)}`;\n}\n\n\nexport function dhtLocationFrom32(hashCore: Uint8Array): Uint8Array {\n  const hash = new Uint8Array(16);\n  blake2b(hash.length).update(hashCore).digest(hash);\n\n  const out = hash.slice(0, 4);\n  [4, 8, 12].forEach((i) => {\n    out[0] ^= hash[i];\n    out[1] ^= hash[i + 1];\n    out[2] ^= hash[i + 2];\n    out[3] ^= hash[i + 3];\n  });\n\n  return out;\n}\n\n/** ------------------------------------------------------------------------------------------------------------------*/\n\nexport enum HoloHashType {\n  Action = \"Action\",\n  Agent = \"Agent\",\n  //DhtOp = \"DhtOp\",\n  Dna = \"Dna\",\n  Entry = \"Entry\",\n  External = \"External\",\n  Network = \"Network\",\n  //Warrent = \"Warrent\",\n  Wasm = \"Wasm\",\n}\n\nexport const HASH_TYPE_PREFIX_B64 = {\n  Action: \"uhCkk\",\n  Agent: \"uhCAk\",\n  Dna: \"uhC0k\",\n  //DhtOp: \"hCQk\",\n  Entry: \"uhCEk\",\n  External: \"uhC8k\",\n  Network: \"uhCIk\",\n  //Warrent: \"Warrent\",\n  Wasm: \"uhCok\",\n};\n\nexport function getHashType(hash: HoloHashB64): HoloHashType {\n  const hashExt = hash.slice(0, 5);\n  const hashPrefixes = Object.values(HASH_TYPE_PREFIX_B64)\n  for (let i = 0; i < hashPrefixes.length; i+= 1) {\n    if (hashPrefixes[i] == hashExt) {\n      return Object.keys(HASH_TYPE_PREFIX_B64)[i] as HoloHashType;\n    }\n  }\n  throw Error(\"Unknown hash type\");\n}\n\n\n/** */\nexport function isHashTypeB64(hash: HoloHashB64, hashType: HoloHashType) {\n  const slice = hash.slice(0, 5);\n  const prefix = HASH_TYPE_PREFIX_B64[hashType];\n  for (let i = 0; i < prefix.length; i++) {\n    if (slice[i] !== prefix[i]) {\n      return false;\n    }\n  }\n  return true;\n}\n\n\nexport function hasHoloHashType(hash: HoloHashB64): boolean {\n  return !!Object.values(HASH_TYPE_PREFIX_B64).find((prefix) => hash.startsWith(`${prefix}`));\n}\n\n\n/** */\nexport function validateHashB64(hash: HoloHashB64, hashType?: HoloHashType) {\n  if (!hash || typeof(hash) != 'string') {\n    throw new Error(\"The hash must be a valid string\");\n  }\n  if (hash.length !== 53) {\n    throw new Error(\"The hash must be exactly 53 characters long. Got: \" + hash.length);\n  }\n  if((hashType && !isHashTypeB64(hash, hashType)) || !hasHoloHashType(hash)) {\n    throw new Error(\"The hash must have a valid HoloHashB64 type.\");\n  }\n}\n\n\nexport function dec64(hash: HoloHashB64): Uint8Array {\n  validateHashB64(hash);\n  return decodeHashFromBase64(hash);\n}\n\nexport function enc64(hash: Uint8Array): HoloHashB64 {\n  let b64 = encodeHashToBase64(hash);\n  validateHashB64(b64);\n  return b64;\n}\n\nfunction isUint8Array(value: any): boolean {\n  return value instanceof Uint8Array;\n}\n\n/** A HoloHash starts with 'u' has a type and is 53 chars long */\nexport abstract class HolochainId {\n  public readonly b64: HoloHashB64;\n\n  static readonly HASH_TYPE: HoloHashType;\n\n  get hashType(): HoloHashType {\n    return (this.constructor as typeof HolochainId).HASH_TYPE;\n  }\n\n  /** ctor: validate */\n  constructor(input: HoloHashB64 | Uint8Array) {\n    if (typeof(input) != 'string') {\n      input = encodeHashToBase64(input);\n    }\n    validateHashB64(input, this.hashType);\n    this.b64 = input;\n  }\n\n  /** */\n  equals<T extends HolochainId>(other: T | Uint8Array | string): boolean {\n    //console.log(\"equals\", other, isUint8Array(other));\n    if (!other) {\n      return false;\n    }\n    let b64;\n    if (typeof(other) == 'string') {\n      b64 = other;\n    } else {\n      if (isUint8Array(other)) {\n        b64 = enc64(other as Uint8Array);\n      } else {\n        b64 = (other as T).b64;\n      }\n    }\n    return b64 == this.b64;\n  }\n\n\n  /** */\n  static empty<T extends HolochainId>(this: new (input: HoloHashB64 | Uint8Array) => T, byte?: number): T {\n    const empty = new Uint8Array(32);\n    byte = byte? byte : 0;\n    empty.fill(byte);\n    const newHash = Uint8Array.from([\n      ...HASH_TYPE_PREFIX[(this as unknown as typeof HolochainId).HASH_TYPE],\n      ...empty,\n      ...dhtLocationFrom32(empty),\n    ]);\n    return new this(newHash);\n  }\n\n  /** */\n  static from<T extends HolochainId, Z extends HolochainId>(this: new (input: HoloHashB64 | Uint8Array) => Z, start: T): Z {\n    const core = Uint8Array.from(start.hash.slice(3, 35));\n    const hashType = (this as unknown as typeof HolochainId).HASH_TYPE;\n    const newHash = Uint8Array.from([\n      ...HASH_TYPE_PREFIX[hashType],\n      ...core,\n      ...dhtLocationFrom32(core),\n    ]);\n    return new this(newHash);\n  }\n\n\n  /** */\n  static async random<T extends HolochainId>(this: new (input: HoloHashB64 | Uint8Array) => T): Promise<T> {\n    const core = await randomByteArray(32);\n    const newHash = Uint8Array.from([\n      ...HASH_TYPE_PREFIX[(this as unknown as typeof HolochainId).HASH_TYPE],\n      ...core,\n      ...dhtLocationFrom32(core),\n    ]);\n    return new this(newHash);\n  }\n\n\n  // Don't autoconvert to string as this can lead to confusions. Have convert to string be explicit\n  toString(): string {throw Error(\"Implicit conversion of HolochainId to string\")}\n\n  //toString(): string {return this.b64;}\n\n  get hash(): Uint8Array { return dec64(this.b64) }\n  /** First 8 chars of the Core */\n  get short(): string { return this.b64.slice(5, 13); }\n\n  print(): string { return `${this.short} (${this.hashType})`}\n}\n\n\nexport class ActionId extends HolochainId { static readonly HASH_TYPE = HoloHashType.Action; action() {} }\nexport class AgentId extends HolochainId { static readonly HASH_TYPE = HoloHashType.Agent; agent() {} }\nexport class EntryId extends HolochainId { static readonly HASH_TYPE = HoloHashType.Entry; entry() {} }\nexport class DnaId extends HolochainId { static readonly HASH_TYPE = HoloHashType.Dna; dna() {} }\nexport class ExternalId extends HolochainId { static readonly HASH_TYPE = HoloHashType.External; external() {} }\n\n//export class AnyId extends HolochainId { static readonly HASH_TYPE = HoloHashType.Any; any() {} }\n\nexport type DhtId = ActionId | EntryId;\nexport type LinkableId = DhtId | ExternalId;\nexport type AnyId = LinkableId | AgentId | DnaId;\n\n\n\n\n/** */\nexport function intoDhtId(input: HoloHashB64 | Uint8Array): DhtId {\n  try {\n    const actionId = new ActionId(input);\n    return actionId;\n  } catch(e) {\n      const entryId = new EntryId(input);\n      return entryId;\n  }\n}\n\n\n/** */\nexport function intoLinkableId(input: HoloHashB64 | Uint8Array): LinkableId {\n  try {\n    const dhtId = intoDhtId(input);\n    return dhtId;\n  } catch(e) {\n    const externalId = new ExternalId(input);\n    return externalId;\n  }\n}\n\n\n/** -- MsgPack ExtensionCodec for HolochainId -- */\n\nexport const HOLOCHAIN_ID_EXT_CODEC = new ExtensionCodec();\n\nHOLOCHAIN_ID_EXT_CODEC.register({\n  type: getIndexByVariant(HoloHashType, HoloHashType.Agent),\n  encode: (object: unknown): Uint8Array | null => {\n    if (object instanceof AgentId) {\n      return encode(object.b64);\n    } else {\n      return null;\n    }\n  },\n  decode: (data: Uint8Array) => {\n    const b64 = decode(data) as AgentPubKeyB64;\n    return new AgentId(b64);\n  },\n});\n\nHOLOCHAIN_ID_EXT_CODEC.register({\n  type: getIndexByVariant(HoloHashType, HoloHashType.Entry),\n  encode: (object: unknown): Uint8Array | null => {\n    if (object instanceof EntryId) {\n      return encode(object.b64);\n    } else {\n      return null;\n    }\n  },\n  decode: (data: Uint8Array) => {\n    const b64 = decode(data) as EntryHashB64;\n    return new EntryId(b64);\n  },\n});\n\n\nHOLOCHAIN_ID_EXT_CODEC.register({\n  type: getIndexByVariant(HoloHashType, HoloHashType.Action),\n  encode: (object: unknown): Uint8Array | null => {\n    if (object instanceof ActionId) {\n      return encode(object.b64);\n    } else {\n      return null;\n    }\n  },\n  decode: (data: Uint8Array) => {\n    const b64 = decode(data) as ActionHashB64;\n    return new ActionId(b64);\n  },\n});\n\nHOLOCHAIN_ID_EXT_CODEC.register({\n  type: getIndexByVariant(HoloHashType, HoloHashType.Dna),\n  encode: (object: unknown): Uint8Array | null => {\n    if (object instanceof DnaId) {\n      return encode(object.b64);\n    } else {\n      return null;\n    }\n  },\n  decode: (data: Uint8Array) => {\n    const b64 = decode(data) as ActionHashB64;\n    return new DnaId(b64);\n  },\n});\n\n\n/** -- TESTING -- */\n\n/** */\nexport async function testHoloId() {\n  console.log(\"testHoloId()\");\n  const emptyAction = ActionId.empty();\n  const emptyEntry = EntryId.empty();\n  const emptyAgent = AgentId.from(emptyEntry);\n  const emptyEntry2 = EntryId.from(emptyAgent);\n  const randomEh = await EntryId.random();\n\n  console.log(\"testHoloId()\", emptyAction);\n  /** */\n  function printEh(eh: EntryId) {\n    console.log(\"printEh\", eh);\n  }\n\n  printEh(emptyEntry);\n  printEh(emptyEntry2);\n  printEh(randomEh);\n  console.log(\"testHoloId.emptyEntry\", emptyEntry.equals(emptyEntry), emptyEntry.equals(emptyEntry.b64), emptyEntry.equals(emptyEntry.hash));\n  console.log(\"testHoloId.emptyEntry2\", emptyEntry.equals(emptyEntry2), emptyEntry.equals(emptyEntry2.b64), emptyEntry.equals(emptyEntry2.hash));\n  console.log(\"testHoloId.randomEh\", emptyEntry.equals(randomEh), emptyEntry.equals(emptyAgent), emptyEntry.equals(emptyAgent.hash), emptyEntry.equals(emptyAgent.b64));\n\n  //printEh(emptyAction); // Should error at compile time\n}\n\n"]}

package/dist/pretty.js

@@ -1,5 +1,4 @@
 import { CellType } from "@holochain/client";
-import { str2CellId } from "./types";
 import { intoStem } from "./cell";
 import { enc64 } from "./hash";
 import { StateChangeType } from "./zomeSignals.types";
@@ -17,8 +16,7 @@ export function prettyDate(date) {
 }
 export function prettySignalLogs(signalLogs) {
     return signalLogs.map((log) => {
-        const dnaHash = enc64(str2CellId(log.cellId)[0]).slice(-8);
-        return { timestamp: prettyDate(new Date(log.ts)), dnaHash, zome: log.zomeName, type: log.type, payload: log.zomeSignal };
+        return { timestamp: prettyDate(new Date(log.ts)), dnaHash: log.cellAddr.dnaId.short, zome: log.zomeName, type: log.type, payload: log.zomeSignal };
     });
 }
 /** */

package/dist/pretty.js.map

@@ -1 +1 @@
-{"version":3,"file":"pretty.js","sourceRoot":"","sources":["../src/pretty.ts"],"names":[],"mappings":"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","sourcesContent":["import {SignalLog} from \"./AppProxy\";\r\nimport {AppInfo, CellType} from \"@holochain/client\";\r\nimport {BaseRoleName, CellsForRole, str2CellId} from \"./types\";\r\nimport {intoStem} from \"./cell\";\r\nimport {enc64} from \"./hash\";\r\nimport {StateChange, StateChangeType} from \"./zomeSignals.types\";\r\n\r\n\r\nconst zeroPad = (num: number, places: number) => String(num).padStart(places, '0')\r\n\r\nexport function prettyDuration(date: Date): string {\r\n  return date.getSeconds() + \".\" + zeroPad(date.getMilliseconds(), 3)\r\n}\r\n\r\n/** */\r\nexport function prettyDate(date: Date): string {\r\n  return \"\"\r\n    + zeroPad(date.getHours(), 2)\r\n    + \":\" + zeroPad(date.getMinutes(), 2)\r\n    + \":\" + zeroPad(date.getSeconds(), 2)\r\n    + \".\" + zeroPad(date.getMilliseconds(), 3);\r\n}\r\n\r\n\r\nexport function prettySignalLogs(signalLogs: SignalLog[]) {\r\n  return signalLogs.map((log) => {\r\n    const dnaHash = enc64(str2CellId(log.cellId)[0]).slice(-8);\r\n    return {timestamp: prettyDate(new Date(log.ts)), dnaHash, zome: log.zomeName, type: log.type, payload: log.zomeSignal};\r\n  })\r\n}\r\n\r\n\r\n/** */\r\nexport function printAppInfo(appInfo: AppInfo): string {\r\n  let print = `Happ \"${appInfo.installed_app_id}\" info: (status: ${JSON.stringify(appInfo.status)})`;\r\n  for (const [roleName, cellInfos] of Object.entries(appInfo.cell_info)) {\r\n    for (const cellInfo of  Object.values(cellInfos)) {\r\n      if (CellType.Stem in cellInfo) {\r\n        const stem = intoStem(cellInfo)!;\r\n        print += `\\n - ${roleName}.${stem.name? stem.name : \"unnamed\"}: ${enc64(stem.dna)} (stem)`;\r\n        continue;\r\n      }\r\n      if (CellType.Provisioned in cellInfo) {\r\n        const cell = cellInfo.provisioned;\r\n        print += `\\n - ${roleName}: ${cell.name} | ${enc64(cell.cell_id[0])}`;\r\n        continue;\r\n      }\r\n      if (CellType.Cloned in cellInfo) {\r\n        const cell = cellInfo.cloned;\r\n        print += `\\n - ${roleName}.${cell.clone_id}: ${cell.name} | ${enc64(cell.cell_id[0])}`;\r\n        continue;\r\n      }\r\n    }\r\n  }\r\n  return print;\r\n}\r\n\r\n\r\n/** */\r\nexport function printCellsForRole(baseRoleName: BaseRoleName, cells: CellsForRole): string {\r\n  let print = `CellsForRole \"${baseRoleName}\": (${enc64(cells.provisioned.cell_id[1])})\\n`;\r\n  print += `  - Provisioned: ${cells.provisioned.name} | ${enc64(cells.provisioned.cell_id[0])}\\n`;\r\n  print += `  - Clones : ${Object.values(cells.clones).length}\\n`;\r\n  for (const [cloneId, clone] of Object.entries(cells.clones)) {\r\n    print += `    - (${clone.enabled? \"enabled\" : \"disabled\"})${cloneId}: ${clone.name} | ${enc64(clone.cell_id[0])}\\n`;\r\n  }\r\n  return print;\r\n}\r\n\r\n\r\n\r\n/** */\r\nexport function prettyState(state: StateChange): string {\r\n  if (StateChangeType.Create in state) {\r\n    return state.Create? \"Create NEW\" : \"Create\";\r\n  }\r\n  if (StateChangeType.Update in state) {\r\n    return state.Update? \"Update NEW\" : \"Update\";\r\n  }\r\n  if (StateChangeType.Delete in state) {\r\n    return state.Delete? \"Delete NEW\" : \"Delete\";\r\n  }\r\n  throw Error(\"Unknown stateChange type\");\r\n}\r\n"]}
+{"version":3,"file":"pretty.js","sourceRoot":"","sources":["../src/pretty.ts"],"names":[],"mappings":"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","sourcesContent":["import {SignalLog} from \"./AppProxy\";\r\nimport {AppInfo, CellType} from \"@holochain/client\";\r\nimport {BaseRoleName, CellsForRole} from \"./types\";\r\nimport {intoStem} from \"./cell\";\r\nimport {enc64} from \"./hash\";\r\nimport {StateChange, StateChangeType} from \"./zomeSignals.types\";\r\n\r\n\r\nconst zeroPad = (num: number, places: number) => String(num).padStart(places, '0')\r\n\r\nexport function prettyDuration(date: Date): string {\r\n  return date.getSeconds() + \".\" + zeroPad(date.getMilliseconds(), 3)\r\n}\r\n\r\n/** */\r\nexport function prettyDate(date: Date): string {\r\n  return \"\"\r\n    + zeroPad(date.getHours(), 2)\r\n    + \":\" + zeroPad(date.getMinutes(), 2)\r\n    + \":\" + zeroPad(date.getSeconds(), 2)\r\n    + \".\" + zeroPad(date.getMilliseconds(), 3);\r\n}\r\n\r\n\r\nexport function prettySignalLogs(signalLogs: SignalLog[]) {\r\n  return signalLogs.map((log) => {\r\n    return {timestamp: prettyDate(new Date(log.ts)), dnaHash: log.cellAddr.dnaId.short, zome: log.zomeName, type: log.type, payload: log.zomeSignal};\r\n  })\r\n}\r\n\r\n\r\n/** */\r\nexport function printAppInfo(appInfo: AppInfo): string {\r\n  let print = `Happ \"${appInfo.installed_app_id}\" info: (status: ${JSON.stringify(appInfo.status)})`;\r\n  for (const [roleName, cellInfos] of Object.entries(appInfo.cell_info)) {\r\n    for (const cellInfo of  Object.values(cellInfos)) {\r\n      if (CellType.Stem in cellInfo) {\r\n        const stem = intoStem(cellInfo)!;\r\n        print += `\\n - ${roleName}.${stem.name? stem.name : \"unnamed\"}: ${enc64(stem.dna)} (stem)`;\r\n        continue;\r\n      }\r\n      if (CellType.Provisioned in cellInfo) {\r\n        const cell = cellInfo.provisioned;\r\n        print += `\\n - ${roleName}: ${cell.name} | ${enc64(cell.cell_id[0])}`;\r\n        continue;\r\n      }\r\n      if (CellType.Cloned in cellInfo) {\r\n        const cell = cellInfo.cloned;\r\n        print += `\\n - ${roleName}.${cell.clone_id}: ${cell.name} | ${enc64(cell.cell_id[0])}`;\r\n        continue;\r\n      }\r\n    }\r\n  }\r\n  return print;\r\n}\r\n\r\n\r\n/** */\r\nexport function printCellsForRole(baseRoleName: BaseRoleName, cells: CellsForRole): string {\r\n  let print = `CellsForRole \"${baseRoleName}\": (${enc64(cells.provisioned.cell_id[1])})\\n`;\r\n  print += `  - Provisioned: ${cells.provisioned.name} | ${enc64(cells.provisioned.cell_id[0])}\\n`;\r\n  print += `  - Clones : ${Object.values(cells.clones).length}\\n`;\r\n  for (const [cloneId, clone] of Object.entries(cells.clones)) {\r\n    print += `    - (${clone.enabled? \"enabled\" : \"disabled\"})${cloneId}: ${clone.name} | ${enc64(clone.cell_id[0])}\\n`;\r\n  }\r\n  return print;\r\n}\r\n\r\n\r\n\r\n/** */\r\nexport function prettyState(state: StateChange): string {\r\n  if (StateChangeType.Create in state) {\r\n    return state.Create? \"Create NEW\" : \"Create\";\r\n  }\r\n  if (StateChangeType.Update in state) {\r\n    return state.Update? \"Update NEW\" : \"Update\";\r\n  }\r\n  if (StateChangeType.Delete in state) {\r\n    return state.Delete? \"Delete NEW\" : \"Delete\";\r\n  }\r\n  throw Error(\"Unknown stateChange type\");\r\n}\r\n"]}

package/dist/types.d.ts

@@ -2,6 +2,7 @@ import { CellId, RoleName, ClonedCell, ProvisionedCell, ZomeName, FunctionName }
 import { Dictionary } from "./utils";
 import { AgentId, DnaId } from "./hash";
 import { SystemSignalProtocol } from "./zomeSignals.types";
+export type AnyCell = ProvisionedCell | ClonedCell;
 /** Signal types */
 export declare enum SignalType {
     Unknown = "Unknown",
@@ -58,17 +59,23 @@ export type CellsForRole = {
 /** BaseRoleName -> RoleCells */
 export type RoleCellsMap = Dictionary<CellsForRole>;
 /** */
-export declare function flattenCells(cells: CellsForRole): CellId[];
+export declare function flattenCells(cells: CellsForRole): CellAddress[];
 /** -- CloneId -- */
 export type CloneId = RoleName;
 /** type for string "<baseRoleName>.<cloneIndex>" */
 export declare function createCloneName(baseRoleName: BaseRoleName, cloneIndex: CloneIndex): string;
 /** */
 export declare function destructureCloneId(cloneId: CloneId): [BaseRoleName, CloneIndex] | undefined;
-/** */
-export declare function decomposeCellId(cellId: CellId): [DnaId, AgentId];
-/** -- CellIdStr -- */
+/** -- CellAddress -- */
 export type CellIdStr = string;
-export declare function CellIdStr(dna_or_cell_id: DnaId | CellId, key?: AgentId): CellIdStr;
-/** */
-export declare function str2CellId(str: CellIdStr): CellId;
+export declare class CellAddress {
+    readonly dnaId: DnaId;
+    readonly agentId: AgentId;
+    constructor(dnaId: DnaId, agentId: AgentId);
+    static from(id_or_str: CellId | CellIdStr): CellAddress;
+    intoId(): CellId;
+    toString(): string;
+    get str(): CellIdStr;
+    /** */
+    equals(other: CellAddress): boolean;
+}

package/dist/types.js

@@ -1,4 +1,5 @@
-import { AgentId, dec64, DnaId, enc64 } from "./hash";
+import { HoloHash, } from "@holochain/client";
+import { AgentId, DnaId } from "./hash";
 /** Signal types */
 export var SignalType;
 (function (SignalType) {
@@ -8,8 +9,8 @@ export var SignalType;
 })(SignalType || (SignalType = {}));
 /** */
 export function flattenCells(cells) {
-    let res = Object.entries(cells.clones).map(([cloneId, clone]) => clone.cell_id);
-    res.push(cells.provisioned.cell_id);
+    let res = Object.entries(cells.clones).map(([cloneId, clone]) => CellAddress.from(clone.cell_id));
+    res.push(CellAddress.from(cells.provisioned.cell_id));
     return res;
 }
 /** type for string "<baseRoleName>.<cloneIndex>" */
@@ -26,26 +27,33 @@ export function destructureCloneId(cloneId) {
     }
     return [subs[0], Number(subs[1])];
 }
-/** */
-export function decomposeCellId(cellId) {
-    return [new DnaId(cellId[0]), new AgentId(cellId[1])];
-}
 const CELL_ID_SEPARATOR = "||";
-export function CellIdStr(dna_or_cell_id, key) {
-    if (Array.isArray(dna_or_cell_id)) {
-        return "" + enc64(dna_or_cell_id[0]) + CELL_ID_SEPARATOR + enc64(dna_or_cell_id[1]);
+export class CellAddress {
+    constructor(dnaId, agentId) {
+        this.dnaId = dnaId;
+        this.agentId = agentId;
     }
-    if (!key) {
-        throw Error("CellIdStr() failed. AgentPubKey not provided");
+    static from(id_or_str) {
+        if (typeof id_or_str == 'string') {
+            const subs = id_or_str.split(CELL_ID_SEPARATOR);
+            if (subs.length != 2) {
+                throw Error("CellAddress.from() failed. Bad input string format");
+            }
+            return new CellAddress(new DnaId(subs[0]), new AgentId(subs[1]));
+        }
+        return new CellAddress(new DnaId(id_or_str[0]), new AgentId(id_or_str[1]));
     }
-    return "" + dna_or_cell_id.b64 + CELL_ID_SEPARATOR + key.b64;
-}
-/** */
-export function str2CellId(str) {
-    const subs = str.split(CELL_ID_SEPARATOR);
-    if (subs.length != 2) {
-        throw Error("str2CellId() failed. Bad input string format");
+    intoId() {
+        return [new HoloHash(this.dnaId.hash), new HoloHash(this.agentId.hash)];
+    }
+    // Don't autoconvert to string as this can lead to confusions. Have convert to string be explicit
+    toString() { throw Error("Implicit conversion of HolochainId to string"); }
+    get str() {
+        return "" + this.dnaId.b64 + CELL_ID_SEPARATOR + this.agentId.b64;
+    }
+    /** */
+    equals(other) {
+        return this.str == other.str;
     }
-    return [dec64(subs[0]), dec64(subs[1])];
 }
 //# sourceMappingURL=types.js.map