@wishknish/knishio-client-ts 0.7.2 → 0.7.6

package/src/response/ResponseMetaTypeViaMolecule.ts

@@ -0,0 +1,224 @@
+/*
+                               (
+                              (/(
+                              (//(
+                              (///(
+                             (/////(
+                             (//////(                          )
+                            (////////(                        (/)
+                            (////////(                       (///)
+                           (//////////(                      (////)
+                           (//////////(                     (//////)
+                          (////////////(                    (///////)
+                         (/////////////(                   (/////////)
+                        (//////////////(                  (///////////)
+                        (///////////////(                (//////////////)
+                       (////////////////(               (///////////////)
+                      (((((((((((((((((((              (((((((((((((((
+                     (((((((((((((((((((              ((((((((((((((
+                     (((((((((((((((((((            ((((((((((((((
+                    ((((((((((((((((((((           (((((((((((((
+                    ((((((((((((((((((((          ((((((((((((
+                    (((((((((((((((((((         ((((((((((((
+                    (((((((((((((((((((        ((((((((((
+                    ((((((((((((((((((/      (((((((((
+                    ((((((((((((((((((     ((((((((
+                    (((((((((((((((((    (((((((
+                   ((((((((((((((((((  (((((
+                   #################  ##
+                   ################  #
+                  ################# ##
+                 %################  ###
+                 ###############(   ####
+                ###############      ####
+               ###############       ######
+              %#############(        (#######
+             %#############           #########
+            ############(              ##########
+           ###########                  #############
+          #########                      ##############
+        %######
+
+        Powered by Knish.IO: Connecting a Decentralized World
+
+Please visit https://github.com/WishKnish/KnishIO-Client-TS for information.
+
+License: https://github.com/WishKnish/KnishIO-Client-TS/blob/master/LICENSE
+*/
+
+import type Query from '../query/Query'
+import Response from './Response'
+import CheckMolecule from '../libraries/CheckMolecule'
+
+/**
+ * Response for MetaType queries via Molecule data.
+ *
+ * Instead of relying solely on the instance-level `metas` field,
+ * this response can extract metadata from molecule atoms' `metasJson`,
+ * and provides cryptographic integrity verification via `verifyIntegrity()`.
+ */
+export default class ResponseMetaTypeViaMolecule extends Response {
+  /**
+   * Class constructor
+   */
+  constructor({
+    query,
+    json
+  }: {
+    query: Query
+    json: any
+  }) {
+    super({
+      query,
+      json,
+      dataKey: 'data.MetaTypeViaAtom'
+    })
+  }
+
+  /**
+   * Extracts metas from a molecule's atoms' metasJson for a specific instance.
+   * Filters atoms by matching metaType and metaId, then parses metasJson.
+   */
+  static extractMetasFromMolecule(
+    molecule: any,
+    metaType: string,
+    metaId: string
+  ): Array<{
+    molecularHash: string
+    position: string
+    key: string
+    value: string
+    createdAt: string
+  }> {
+    if (!molecule || !molecule.atoms) {
+      return []
+    }
+
+    const metas: Array<{
+      molecularHash: string
+      position: string
+      key: string
+      value: string
+      createdAt: string
+    }> = []
+
+    for (const atom of molecule.atoms) {
+      if (atom.metaType !== metaType || atom.metaId !== metaId) {
+        continue
+      }
+
+      if (!atom.metasJson) {
+        continue
+      }
+
+      let parsed: any
+      try {
+        parsed = JSON.parse(atom.metasJson)
+        if (!Array.isArray(parsed)) {
+          continue
+        }
+      } catch (e) {
+        continue
+      }
+
+      for (const entry of parsed) {
+        metas.push({
+          molecularHash: molecule.molecularHash,
+          position: atom.position,
+          key: entry.key,
+          value: entry.value,
+          createdAt: atom.createdAt
+        })
+      }
+    }
+
+    return metas
+  }
+
+  /**
+   * Returns meta type instance results with metas synthesized from molecule data.
+   * Produces the same payload format as ResponseMetaType and ResponseMetaTypeViaAtom:
+   * { instances, instanceCount, paginatorInfo }
+   */
+  override payload(): any | null {
+    const metaTypeData = this.data()
+
+    if (!metaTypeData || metaTypeData.length === 0) {
+      return null
+    }
+
+    const response: any = {
+      instances: {},
+      instanceCount: {},
+      paginatorInfo: {}
+    }
+
+    const metaData = metaTypeData.pop()
+
+    if (metaData.instances) {
+      response.instances = metaData.instances.map((instance: any) => {
+        // Prefer server-filtered metas when available
+        let metas = instance.metas
+        if (!metas || metas.length === 0) {
+          // Fallback: synthesize from molecule atoms' metasJson
+          metas = ResponseMetaTypeViaMolecule.extractMetasFromMolecule(
+            instance.molecule,
+            instance.metaType,
+            instance.metaId
+          )
+        }
+
+        return {
+          ...instance,
+          metas
+        }
+      })
+    }
+
+    if (metaData.instanceCount) {
+      response.instanceCount = metaData.instanceCount
+    }
+
+    if (metaData.paginatorInfo) {
+      response.paginatorInfo = metaData.paginatorInfo
+    }
+
+    return response
+  }
+
+  /**
+   * Verifies the cryptographic integrity of all molecules associated
+   * with meta instances in this response.
+   */
+  verifyIntegrity(): {
+    verified: boolean
+    molecules: Array<{
+      molecularHash: string | null
+      verified: boolean
+      error: string | null
+    }>
+  } {
+    const results: Array<{
+      molecularHash: string | null
+      verified: boolean
+      error: string | null
+    }> = []
+    const metaTypeData = this.data()
+
+    if (!metaTypeData || metaTypeData.length === 0) {
+      return { verified: true, molecules: results }
+    }
+
+    const instances = metaTypeData[metaTypeData.length - 1]?.instances || []
+
+    for (const instance of instances) {
+      if (!instance.molecule) continue
+      results.push(CheckMolecule.verifyFromServerData(instance.molecule))
+    }
+
+    return {
+      verified: results.length === 0 || results.every((r: any) => r.verified),
+      molecules: results
+    }
+  }
+}

package/src/response/ResponsePeering.ts

@@ -0,0 +1,17 @@
+/*
+        Powered by Knish.IO: Connecting a Decentralized World
+
+Please visit https://github.com/WishKnish/KnishIO-Client-TS for information.
+
+License: https://github.com/WishKnish/KnishIO-Client-TS/blob/master/LICENSE
+*/
+
+import ResponseProposeMolecule from './ResponseProposeMolecule'
+
+/**
+ * Response for peer registration via P-isotope
+ * Matches JavaScript SDK ResponsePeering implementation exactly
+ */
+export default class ResponsePeering extends ResponseProposeMolecule {
+
+}

package/src/response/ResponsePolicy.ts

@@ -65,10 +65,9 @@ export default class ResponsePolicy extends Response {
   }) {
     super({
       query,
-      json
+      json,
+      dataKey: 'data.Policy'
     })
-    this.dataKey = 'data.Policy'
-    this.init()
   }
 
   /**

package/src/response/ResponseProposeMolecule.ts

@@ -74,7 +74,6 @@ export default class ResponseProposeMolecule extends Response {
       dataKey: 'data.ProposeMolecule'
     })
     this.$__clientMolecule = (query as any).molecule()
-    this.init()
   }
 
   /**

package/src/response/ResponseRequestAuthorization.ts

@@ -75,13 +75,43 @@ export default class ResponseRequestAuthorization extends ResponseProposeMolecul
   }
 
   /**
-   * Returns timestamp
-   * Matches JavaScript SDK time method exactly
+   * Returns raw time value from payload
    */
   time(): string {
     return this.payloadKey('time')
   }
 
+  /**
+   * Returns the expiration timestamp as Unix seconds.
+   * Handles both server formats:
+   * - PHP server: time = lifetime in ms, expiresAt = Unix timestamp in payload
+   * - Rust server: time = Unix timestamp in seconds
+   */
+  expiresAt(): number {
+    // Try the explicit expiresAt payload key first (PHP server provides this)
+    try {
+      const ea = this.payloadKey('expiresAt')
+      if (ea) {
+        return Number(ea)
+      }
+    } catch (_e) {
+      // Not available in payload, fall back
+    }
+
+    // Use time field with heuristic detection
+    const timeValue = Number(this.time())
+
+    // If timeValue looks like a valid Unix timestamp (>= year 2020), use directly
+    // Rust server sets time = Unix timestamp in seconds
+    if (timeValue >= 1577836800) {
+      return timeValue
+    }
+
+    // Otherwise, time is a lifetime in milliseconds (PHP server format)
+    // Convert to Unix timestamp: now_seconds + lifetime_seconds
+    return Math.floor(Date.now() / 1000) + Math.floor(timeValue / 1000)
+  }
+
   /**
    * Returns encryption info
    * Matches JavaScript SDK encrypt method exactly

package/src/response/ResponseRequestAuthorizationGuest.ts

@@ -111,12 +111,36 @@ export default class ResponseRequestAuthorizationGuest extends Response {
   }
 
   /**
-   * Returns timestamp
+   * Returns raw time value from payload
    */
   time(): any {
     return this.payloadKey('time')
   }
 
+  /**
+   * Returns the expiration timestamp as Unix seconds.
+   * Handles both server formats:
+   * - PHP server: time = lifetime in ms, expiresAt = Unix timestamp in payload
+   * - Rust server: time = Unix timestamp in seconds
+   */
+  expiresAt(): number {
+    try {
+      const ea = this.payloadKey('expiresAt')
+      if (ea) {
+        return Number(ea)
+      }
+    } catch (_e) {
+      // Not available in payload, fall back
+    }
+
+    const timeValue = Number(this.time())
+    if (timeValue >= 1577836800) {
+      return timeValue
+    }
+
+    return Math.floor(Date.now() / 1000) + Math.floor(timeValue / 1000)
+  }
+
   /**
    * Returns public key
    */

package/src/response/ResponseWalletList.ts

@@ -125,7 +125,7 @@ export default class ResponseWalletList extends Response {
       }
     }
 
-    wallet.balance = Number(data.amount)
+    wallet.balance = String(data.amount != null ? data.amount : 0)
     wallet.pubkey = data.pubkey
     wallet.createdAt = data.createdAt
 

package/src/schemas/index.ts

@@ -248,6 +248,17 @@ export const RequestTokensParamsSchema = z.object({
   meta: z.union([MetaDataSchema, z.null()]).optional()
 }).strict()
 
+// =============================================================================
+// FILTER SCHEMAS
+// =============================================================================
+
+export const MetaFilterSchema = z.object({
+  key: z.string(),
+  value: z.string(),
+  comparison: z.string().optional(),
+  criterion: z.string().optional()
+}).strict()
+
 // =============================================================================
 // QUERY PARAMETER SCHEMAS
 // =============================================================================
@@ -265,7 +276,7 @@ export const MetaQueryParamsSchema = z.object({
   key: z.union([z.string(), z.null()]).optional(),
   value: z.union([z.string(), z.null()]).optional(),
   latest: z.union([z.boolean(), z.null()]).optional(),
-  filter: z.union([z.string(), z.null()]).optional(),
+  filter: z.union([z.array(MetaFilterSchema), z.null()]).optional(),
   queryArgs: z.union([z.record(z.unknown()), z.null()]).optional(),
   count: z.union([z.number().int().min(1), z.null()]).optional(),
   countBy: z.union([z.string(), z.null()]).optional(),

package/src/types/client.ts

@@ -58,7 +58,8 @@ import type {
   MetaId,
   CellSlug,
   MetaData,
-  BaseResponse
+  BaseResponse,
+  MetaFilter
 } from './index'
 
 // =============================================================================
@@ -237,7 +238,7 @@ export interface MetaQueryOptions {
   key?: string | null
   value?: string | null
   latest?: boolean | null
-  filter?: string | null
+  filter?: MetaFilter[] | null
   queryArgs?: Record<string, unknown> | null
   count?: number | null
   countBy?: string | null

package/src/types/graphql.ts

@@ -59,7 +59,8 @@ import type {
   MetaId,
   CellSlug,
   AtomIsotope,
-  MetaData
+  MetaData,
+  MetaFilter
 } from './index'
 
 // =============================================================================
@@ -173,7 +174,7 @@ export interface QueryMetaTypeVariables {
   key?: string | null
   value?: string | null
   latest?: boolean | null
-  filter?: string | null
+  filter?: MetaFilter[] | null
   queryArgs?: Record<string, unknown> | null
   count?: number | null
   countBy?: string | null

package/src/types/guards.ts

@@ -115,8 +115,8 @@ export function assertExhaustive<T>(
  * Exhaustive isotope type guard with compile-time checking
  */
 export function isAtomIsotope(value: unknown): value is AtomIsotope {
-  return typeof value === 'string' && 
-    (['C', 'V', 'U', 'T', 'M', 'I', 'R', 'B', 'F'] as const).includes(value as AtomIsotope)
+  return typeof value === 'string' &&
+    (['C', 'V', 'U', 'T', 'M', 'I', 'R', 'B', 'F', 'P', 'A'] as const).includes(value as AtomIsotope)
 }
 
 /**
@@ -158,6 +158,14 @@ export function isFuseIsotope(value: unknown): value is 'F' {
   return value === 'F'
 }
 
+export function isPeerIsotope(value: unknown): value is 'P' {
+  return value === 'P'
+}
+
+export function isAppendIsotope(value: unknown): value is 'A' {
+  return value === 'A'
+}
+
 /**
  * Exhaustive isotope handler with compile-time completeness
  */
@@ -173,6 +181,8 @@ export function handleIsotope<T>(
     readonly R: () => T
     readonly B: () => T
     readonly F: () => T
+    readonly P: () => T
+    readonly A: () => T
   }
 ): T {
   switch (isotope) {
@@ -185,6 +195,8 @@ export function handleIsotope<T>(
     case 'R': return handlers.R()
     case 'B': return handlers.B()
     case 'F': return handlers.F()
+    case 'P': return handlers.P()
+    case 'A': return handlers.A()
     default: return assertNever(isotope)
   }
 }
@@ -378,11 +390,10 @@ export function isCellSlug(value: unknown): value is CellSlug {
 }
 
 /**
- * Batch ID validation (UUID format)
+ * Batch ID validation (64-char hex string, matching JS SDK)
  */
 export function isBatchId(value: unknown): value is BatchId {
-  return typeof value === 'string' && 
-    /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(value)
+  return typeof value === 'string' && /^[a-f0-9]{64}$/i.test(value)
 }
 
 // =============================================================================
@@ -594,6 +605,8 @@ export const Guards = {
     rule: isRuleIsotope,
     buffer: isBufferIsotope,
     fuse: isFuseIsotope,
+    peer: isPeerIsotope,
+    append: isAppendIsotope,
     handle: handleIsotope
   },
   

package/src/types/index.ts

@@ -172,8 +172,8 @@ export interface AtomMetaData extends MetaData {
 export interface AtomParams {
   position?: string | null
   walletAddress?: WalletAddress | null
-  isotope?: AtomIsotope
-  token?: TokenSlug | string
+  isotope?: AtomIsotope | null
+  token?: TokenSlug | string | null
   value?: string | number | null
   batchId?: BatchId | string | null
   metaType?: MetaType | string | null
@@ -182,7 +182,7 @@ export interface AtomParams {
   otsFragment?: string | null
   index?: number | null
   createdAt?: string | null
-  version?: number | null
+  version?: string | number | null | undefined
 }
 
 export interface WalletParams {
@@ -284,6 +284,21 @@ export interface RequestTokensParams {
   meta?: MetaData | null
 }
 
+// =============================================================================
+// FILTER TYPES
+// =============================================================================
+
+/**
+ * MetaFilter interface for filtering meta queries
+ * Matches the GraphQL MetaFilter input type from the server
+ */
+export interface MetaFilter {
+  key: string
+  value: string
+  comparison?: string  // '=', '<', '>', '<=', '>=', '!='
+  criterion?: string
+}
+
 // =============================================================================
 // QUERY PARAMETER TYPES
 // =============================================================================
@@ -301,7 +316,7 @@ export interface MetaQueryParams {
   key?: string | null
   value?: string | null
   latest?: boolean | null
-  filter?: string | null
+  filter?: MetaFilter[] | null
   queryArgs?: Record<string, unknown> | null
   count?: number | null
   countBy?: string | null