neozipkit 0.2.1 → 0.3.0

package/src/blockchain/node/index.ts

@@ -0,0 +1,40 @@
+/**
+ * Node Blockchain Module Exports
+ * Node.js-specific blockchain functionality for ZIP file tokenization
+ * 
+ * Note: ZipkitMinter and ZipkitVerifier convenience methods (retry, batch) 
+ * are now available in the core module. Only WalletManagerNode is Node.js-specific
+ * due to file system operations.
+ */
+
+export { WalletManagerNode, ZipkitWallet } from './WalletManagerNode';
+
+// Re-export specific core functionality to avoid duplicates
+export { 
+  ZipkitMinter,
+  ZipkitVerifier,
+  CoreWalletManager,
+  WalletAnalyzer,
+  createTimestamp,
+  verifyOts,
+  verifyOtsZip
+} from '../core';
+export type {
+  MintingOptions,
+  MintingResult,
+  VerificationOptions,
+  VerificationResult,
+  WalletInfo,
+  NetworkConfig,
+  TokenMetadata,
+  WalletSetupResult,
+  CommonTokenConfig,
+  TokenInfo,
+  WalletBasicInfo,
+  TokenScanResult,
+  NZipTokenDetails,
+  TimestampResult,
+  TimestampInfo,
+  DeserializeOtsResult,
+  OtsVerifyResult
+} from '../core';

package/src/browser/{ZipKitBrowser.ts → ZipkitBrowser.ts}

@@ -1,39 +1,41 @@
 // ======================================
-//	ZipKitBrowser.ts
+//	ZipkitBrowser.ts
 //  Copyright (c) 2025 NeoWare, Inc. All rights reserved.
 // ======================================
 
-import ZipKit, { CompressOptions, CreateZipOptions } from '../shared/ZipKit';
-import ZipEntry from '../shared/ZipEntry';
-import Errors from '../shared/constants/Errors';
-import * as Headers from '../shared/constants/Headers';
-import { TOKENIZED_METADATA, TIMESTAMP_SUBMITTED, TIMESTAMP_METADATA } from '../shared/constants/Headers';
-import { sha256 } from '../shared/components/ZipCrypto';
-import { crc32 } from '../shared/components/Util';
-import { DATATYPE, getTypeOf } from '../shared/components/Util';
-import type { FileData } from '../shared/types';
-
-// Re-export everything from ZipKit
-export * from '../shared/ZipKit';
+import Zipkit, { CompressOptions, CreateZipOptions } from '../core';
+import ZipEntry from '../core/ZipEntry';
+import { ZipCompress } from '../core/ZipCompress';
+import Errors from '../core/constants/Errors';
+import * as Headers from '../core/constants/Headers';
+import { TOKENIZED_METADATA, TIMESTAMP_SUBMITTED, TIMESTAMP_METADATA } from '../core/constants/Headers';
+import { sha256, crc32 } from '../core/encryption/ZipCrypto';
+import { DATATYPE, getTypeOf } from '../core/components/Util';
+import type { FileData } from '../types';
+import HashCalculator from '../core/components/HashCalculator';
+
+// Re-export everything from Zipkit
+export * from '../core';
 export { ZipEntry, Errors, Headers, sha256, getTypeOf };
 
 // ======================================
-//	ZipKitBrowser
+//	ZipkitBrowser
 // ======================================
 
-export default class ZipKitBrowser extends ZipKit {
+export default class ZipkitBrowser extends Zipkit {
   constructor() {
     super();      // Call the parent constructor
 
-    // console.log('ZipKit.support.isNode: ', ZipKit.support.isNode);
-    // console.log('ZipKit.support.buffer: ', ZipKit.support.buffer);
-    // console.log('ZipKit.support.blob: ', ZipKit.support.blob);
-    // console.log('ZipKit.support.streams: ', ZipKit.support.streams);
-    // console.log('ZipKit.support.fileReader: ', ZipKit.support.fileReader);
+    // console.log('Zipkit.support.isNode: ', Zipkit.support.isNode);
+    // console.log('Zipkit.support.buffer: ', Zipkit.support.buffer);
+    // console.log('Zipkit.support.blob: ', Zipkit.support.blob);
+    // console.log('Zipkit.support.streams: ', Zipkit.support.streams);
+    // console.log('Zipkit.support.fileReader: ', Zipkit.support.fileReader);
   }
 
   // --------------------------------------
   // Load a ZIP file from a Blob and return the ZipEntry array
+  // Always uses loadZip() to ensure proper initialization
 
   async loadZipBlob(data: Blob): Promise<ZipEntry[] | null> {
     if (getTypeOf(data) !== DATATYPE.BLOB) {
@@ -41,30 +43,34 @@ export default class ZipKitBrowser extends ZipKit {
     }
 
     return new Promise((resolve, reject) => {
-      const _readEntries = (data: Buffer): ZipEntry[] | null => {
-        try { 
-          super.loadZip(data);
-          return super.getDirectory();
-        } catch (error) {
-          reject(error);
-          return null;
-        }
-      };
-
       const reader = new window.FileReader();
       reader.readAsArrayBuffer(data);
 
-      reader.onload = function(this: FileReader, e: ProgressEvent<FileReader>) {
-        if (!this.result) {
+      reader.onload = (e: ProgressEvent<FileReader>) => {
+        if (!reader.result) {
           reject(new Error('Failed to read file'));
           return;
         }
-        const _inBuf = Buffer.from(this.result as ArrayBuffer);
-        resolve(_readEntries(_inBuf));
+        
+        try {
+          // Convert ArrayBuffer to Buffer
+          const buffer = Buffer.from(reader.result as ArrayBuffer);
+          
+          // Always use loadZip() which:
+          // 1. Resets ZIP data
+          // 2. Stores buffer in this.inBuffer
+          // 3. Loads EOCD and parses central directory
+          // 4. Stores entries in this.zipEntries
+          // 5. Returns the entries
+          const entries = super.loadZip(buffer);
+          resolve(entries);
+        } catch (error) {
+          reject(error);
+        }
       };
 
-      reader.onerror = function(this: FileReader, e: ProgressEvent<FileReader>) {
-        reject(this.error || new Error('Failed to read file'));
+      reader.onerror = () => {
+        reject(reader.error || new Error('Failed to read file'));
       };
     });
   }
@@ -104,7 +110,8 @@ export default class ZipKitBrowser extends ZipKit {
 
     return new Promise(async (resolve, reject) => {
       const _compressData = async (entry: ZipEntry, data: Buffer, options?: CompressOptions): Promise<Buffer> => {
-        return await super.compressData(entry, data, options);
+        // Use Zipkit wrapper method
+        return await this.compressData(entry, data, options);
       };
 
       const reader = new window.FileReader();
@@ -135,7 +142,7 @@ export default class ZipKitBrowser extends ZipKit {
 
   async extractBlob(entry: ZipEntry, skipHashCheck?: boolean): Promise<Blob | null> {
     try {
-      const _outBuf = await super.extract(entry, skipHashCheck);
+      const _outBuf = await this.extract(entry, skipHashCheck);
       if (!_outBuf) return null;
       
       // Convert Buffer to Uint8Array for Blob compatibility
@@ -170,7 +177,7 @@ export default class ZipKitBrowser extends ZipKit {
           entry.isUpdated = true;
           // Don't continue here - let it fall through to special handling below
         } else {
-          const inData = super.copyEntry(entry);
+          const inData = await super.copyEntry(entry);
           entry.localHdrOffset = offset;
           offset += inData.length;
           buffers.push(inData);
@@ -186,6 +193,19 @@ export default class ZipKitBrowser extends ZipKit {
 
       const fileBuffer = await entry.fileData.arrayBuffer();
       
+      // Special handling for already-compressed entries - use existing compressed data
+      if (entry.cmpData && entry.compressedSize && entry.crc) {
+        // Entry is already compressed, use the existing compressed data
+        const localHdr = entry.createLocalHdr();
+        entry.localHdrOffset = offset;
+        offset += localHdr.length + entry.cmpData.length;
+        
+        buffers.push(localHdr);
+        buffers.push(entry.cmpData);
+        _onEntryDone(entry, 'Written (pre-compressed)');
+        continue;
+      }
+      
       // Special handling for token metadata files - store uncompressed with CRC-32
       if (entry.filename === TOKENIZED_METADATA || entry.filename === TIMESTAMP_SUBMITTED || entry.filename === TIMESTAMP_METADATA) {
         // For token metadata, use STORED compression (no compression)
@@ -211,7 +231,7 @@ export default class ZipKitBrowser extends ZipKit {
         _onEntryDone(entry, 'Stored (metadata)');
       } else {
         // Normal file processing with compression
-        const cmpData = await super.compressData(entry, Buffer.from(fileBuffer), cmpOptions);
+        const cmpData = await this.compressData(entry, Buffer.from(fileBuffer), cmpOptions);
         const localHdr = entry.createLocalHdr();
 
         entry.localHdrOffset = offset;
@@ -238,5 +258,48 @@ export default class ZipKitBrowser extends ZipKit {
     // Convert Buffer to Uint8Array for Blob compatibility
     const uint8Array = new Uint8Array(combinedBuffer);
     return new Blob([uint8Array], { type: 'application/zip' });
-  } 
+  }
+
+  /**
+   * Checks if a filename is a blockchain metadata file that should be excluded from Merkle Root calculation
+   * @param filename - The filename to check
+   * @returns boolean - True if the file is a metadata file
+   */
+  private isMetadataFile(filename: string): boolean {
+    return filename === TIMESTAMP_SUBMITTED ||
+           filename === TIMESTAMP_METADATA ||
+           filename === TOKENIZED_METADATA;
+  }
+
+  // --------------------------------------
+  // Helper method: Add a file to the ZIP with compression
+  // Simplifies the common workflow of creating entry + compressing
+
+  async addFile(file: FileData, options?: CompressOptions): Promise<ZipEntry> {
+    // Create entry
+    const entry = this.createZipFileEntry(file);
+    
+    // Compress the file
+    // In browser, File objects implement both FileData and Blob interfaces
+    // We need to convert FileData to Blob for compressDataBlob
+    const fileBlob = file as unknown as Blob;
+    const compressedData = await this.compressDataBlob(entry, fileBlob, options);
+    entry.cmpData = compressedData;
+    
+    return entry;
+  }
+
+  // --------------------------------------
+  // Verify a ZIP entry by attempting to extract it
+  // Returns true if the entry is valid, false otherwise
+
+  async verifyEntry(entry: ZipEntry, skipHashCheck?: boolean): Promise<boolean> {
+    try {
+      const blob = await this.extractBlob(entry, skipHashCheck);
+      return blob !== null;
+    } catch (error) {
+      console.error(`Verification failed for ${entry.filename}:`, error);
+      return false;
+    }
+  }
 }

package/src/browser/index.esm.ts

@@ -0,0 +1,37 @@
+// =============================================================================
+// NeoZipkit - Browser ES Module Entry Point
+// =============================================================================
+// This is a clean ES module entry point for browser bundles
+// All exports are named exports for better tree-shaking support
+
+// Buffer polyfill for browser
+import { Buffer } from 'buffer';
+if (typeof globalThis !== 'undefined') {
+  (globalThis as any).Buffer = Buffer;
+}
+
+// Core exports
+export * from '../core';
+
+// Browser-specific class
+export { default as ZipkitBrowser } from './ZipkitBrowser';
+
+// Re-export ZipEntry as named export for convenience
+export { default as ZipEntry } from '../core/ZipEntry';
+
+// Re-export commonly used types and constants
+export type { CompressOptions, CreateZipOptions } from '../core/ZipCompress';
+export type { FileData, TokenMetadata } from '../types';
+export * from '../core/constants/Headers';
+export * from '../core/constants/Errors';
+
+// Blockchain exports for browser (if needed)
+export * from '../blockchain/browser';
+export { createTokenVerifier } from '../blockchain/browser';
+
+// Platform utilities
+export const PlatformUtils = {
+  isBrowser: typeof window !== 'undefined' && typeof document !== 'undefined',
+  isNode: typeof process !== 'undefined' && process.versions && process.versions.node,
+};
+

package/src/browser/index.ts

@@ -0,0 +1,25 @@
+// =============================================================================
+// NeoZipkit - Browser-Only Package Exports  
+// =============================================================================
+
+// Core shared exports (re-exported from core module)
+export * from '../core';
+import Zipkit from '../core';
+export default Zipkit;
+
+// Browser-only exports
+export { default as ZipkitBrowser } from './ZipkitBrowser';
+export { TokenMetadata } from '../types';
+
+// Blockchain exports for browser
+export * from '../blockchain/browser';
+export { createTokenVerifier } from '../blockchain/browser';
+
+// Platform-specific conditional exports
+export const PlatformUtils = {
+  // Browser detection
+  isBrowser: typeof window !== 'undefined' && typeof document !== 'undefined',
+  // Node.js detection  
+  isNode: typeof process !== 'undefined' && process.versions && process.versions.node,
+};
+