whalibmob 5.5.24 → 5.5.25

package/lib/Store.js

@@ -47,12 +47,12 @@ function sign(privKey32, message) {
 // ─────────────────────────────────────────────────────────
 
 function createNewStore(phoneNumber) {
-  const noiseKeyPair    = generateKeyPair();
-  const identityKeyPair = generateKeyPair();
+  const noiseKeyPair     = generateKeyPair();
+  const identityKeyPair  = generateKeyPair();
   const signedPreKeyPair = generateKeyPair();
 
   const signedPreKeyId = (crypto.randomBytes(3).readUIntBE(0, 3) & 0xffffff) || 1;
-  const signature = sign(identityKeyPair.private, signedPreKeyPair.public);
+  const signature      = sign(identityKeyPair.private, signedPreKeyPair.public);
 
   const registrationId = (crypto.randomBytes(2).readUInt16BE(0) & 0x3fff) + 1;
   const fdid           = uuidv4();
@@ -62,8 +62,10 @@ function createNewStore(phoneNumber) {
   const device  = getDeviceConfig();
   const version = device.os === 'android' ? ANDROID_VERSION_FALLBACK : IOS_VERSION_FALLBACK;
 
+  const normalizedPhone = String(phoneNumber || '').replace(/^\+/, '');
+
   return {
-    phoneNumber: String(phoneNumber).replace(/^\+/, ''),
+    phoneNumber: normalizedPhone,
     noiseKeyPair,
     identityKeyPair,
     signedPreKey: {
@@ -92,8 +94,24 @@ function createNewStore(phoneNumber) {
 // ─────────────────────────────────────────────────────────
 
 function storeToJson(store) {
+  if (!store) {
+    throw new Error('storeToJson: store is undefined or null');
+  }
+
+  const normalizedPhone = store.phoneNumber
+    ? String(store.phoneNumber).replace(/^\+/, '')
+    : '';
+
+  const name    = store.name || 'User';
+  const version = store.version || IOS_VERSION_FALLBACK;
+  const device  = store.device ? Object.assign({}, IOS_DEVICE, store.device) : IOS_DEVICE;
+
+  const advIdentity = store.advIdentity
+    ? store.advIdentity.toString('base64')
+    : null;
+
   return {
-    phoneNumber:    store.phoneNumber,
+    phoneNumber:    normalizedPhone,
     noiseKeyPair: {
       private: store.noiseKeyPair.private.toString('base64'),
       public:  store.noiseKeyPair.public.toString('base64')
@@ -112,18 +130,24 @@ function storeToJson(store) {
     fdid:           store.fdid,
     deviceId:       store.deviceId.toString('base64'),
     identityId:     store.identityId.toString('base64'),
-    registered:     store.registered,
+    registered:     !!store.registered,
     codePending:    store.codePending || false,
-    name:           store.name,
-    version:        store.version,
-    device:         store.device,
-    advIdentity:    store.advIdentity
-      ? store.advIdentity.toString('base64')
-      : null
+    name,
+    version,
+    device,
+    advIdentity
   };
 }
 
 function storeFromJson(obj) {
+  if (!obj) {
+    throw new Error('storeFromJson: input object is undefined or null');
+  }
+
+  const name    = obj.name || 'User';
+  const version = obj.version || IOS_VERSION_FALLBACK;
+  const device  = obj.device ? Object.assign({}, IOS_DEVICE, obj.device) : IOS_DEVICE;
+
   return {
     phoneNumber:    obj.phoneNumber,
     noiseKeyPair: {
@@ -144,11 +168,11 @@ function storeFromJson(obj) {
     fdid:           obj.fdid,
     deviceId:       Buffer.from(obj.deviceId, 'base64'),
     identityId:     Buffer.from(obj.identityId, 'base64'),
-    registered:     obj.registered,
+    registered:     !!obj.registered,
     codePending:    obj.codePending || false,
-    name:           obj.name || 'User',
-    version:        obj.version || IOS_VERSION_FALLBACK,
-    device:         obj.device ? Object.assign({}, IOS_DEVICE, obj.device) : IOS_DEVICE,
+    name,
+    version,
+    device,
     advIdentity:    obj.advIdentity
       ? Buffer.from(obj.advIdentity, 'base64')
       : null
@@ -156,14 +180,23 @@ function storeFromJson(obj) {
 }
 
 function saveStore(store, filePath) {
+  // MAIN FIX: avoid crashing when called with undefined/null store
+  if (!store) {
+    console.warn('saveStore: called with empty store, skipping write for', filePath);
+    return;
+  }
+
   const dir = path.dirname(filePath);
   if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
-  fs.writeFileSync(filePath, JSON.stringify(storeToJson(store), null, 2), 'utf8');
+
+  const json = storeToJson(store);
+  fs.writeFileSync(filePath, JSON.stringify(json, null, 2), 'utf8');
 }
 
 function loadStore(filePath) {
   if (!fs.existsSync(filePath)) return null;
-  return storeFromJson(JSON.parse(fs.readFileSync(filePath, 'utf8')));
+  const raw = fs.readFileSync(filePath, 'utf8');
+  return storeFromJson(JSON.parse(raw));
 }
 
 // ─────────────────────────────────────────────────────────
@@ -171,8 +204,16 @@ function loadStore(filePath) {
 // ─────────────────────────────────────────────────────────
 
 function toSixParts(store) {
+  if (!store) {
+    throw new Error('toSixParts: store is undefined or null');
+  }
+
+  const normalizedPhone = store.phoneNumber
+    ? String(store.phoneNumber).replace(/^\+/, '')
+    : '';
+
   return [
-    store.phoneNumber,
+    normalizedPhone,
     store.noiseKeyPair.public.toString('base64'),
     store.noiseKeyPair.private.toString('base64'),
     store.identityKeyPair.public.toString('base64'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whalibmob",
-  "version": "5.5.24",
+  "version": "5.5.25",
   "description": "WhatsApp library for interaction with WhatsApp Mobile API no web",
   "author": "Kunboruto20",
   "main": "index.js",
@@ -48,4 +48,4 @@
     "async-mutex": "^0.5.0",
     "@cacheable/node-cache": "^3.0.1"
   }
-}
+}