simplex-chat 7.1.0-beta.2 → 7.1.0-beta.4.2

package/src/download-libs.js

@@ -4,8 +4,12 @@ const path = require('path');
 const extract = require('extract-zip');
 
 const GITHUB_REPO = 'simplex-chat/simplex-chat-libs';
-const RELEASE_TAG = 'v7.1.0-beta.2';
+const RELEASE_TAG = 'v7.1.0-beta.4';
 const BACKEND = (process.env.SIMPLEX_BACKEND || process.env.npm_config_simplex_backend || 'sqlite').toLowerCase();
+// A locally built libsimplex, copied into libs/ rather than loaded in place:
+// the addon's RUNPATH is $ORIGIN/../../libs.
+const LIBS_DIR_OVERRIDE = process.env.SIMPLEX_LIBS_DIR || process.env.npm_config_simplex_libs_dir;
+const LIB_NAMES = ['libsimplex.so', 'libsimplex.dylib', 'libsimplex.dll'];
 
 if (BACKEND !== 'sqlite' && BACKEND !== 'postgres') {
   console.error(`✗ Invalid SIMPLEX_BACKEND: "${BACKEND}". Must be "sqlite" or "postgres".`);
@@ -83,8 +87,31 @@ function isAlreadyInstalled() {
   }
 }
 
+// No version check: the files behind SIMPLEX_LIBS_DIR change on every rebuild.
+function installFromOverride() {
+  if (!fs.existsSync(LIBS_DIR_OVERRIDE)) {
+    throw new Error(`SIMPLEX_LIBS_DIR does not exist: ${LIBS_DIR_OVERRIDE}`);
+  }
+  const lib = LIB_NAMES.find((name) => fs.existsSync(path.join(LIBS_DIR_OVERRIDE, name)));
+  if (!lib) {
+    throw new Error(`No ${LIB_NAMES.join(' / ')} in SIMPLEX_LIBS_DIR: ${LIBS_DIR_OVERRIDE}`);
+  }
+  console.log(`Using libraries from SIMPLEX_LIBS_DIR: ${LIBS_DIR_OVERRIDE}`);
+  cleanLibsDirectory();
+  copyDirSync(LIBS_DIR_OVERRIDE, LIBS_DIR);
+  // Not a release tag: a later install without the variable sees a mismatch
+  // and replaces these files with the released ones.
+  fs.writeFileSync(INSTALLED_FILE, `${LIBS_DIR_OVERRIDE}:${BACKEND}`, 'utf-8');
+  console.log(`✓ Installed ${lib} and its runtime libraries from ${LIBS_DIR_OVERRIDE}`);
+}
+
 async function install() {
   try {
+    if (LIBS_DIR_OVERRIDE) {
+      installFromOverride();
+      return;
+    }
+
     // Check if already installed
     if (isAlreadyInstalled()) {
       return;

package/src/simplex.d.ts

@@ -1,10 +1,11 @@
 // These functions are defined in CPP add-on ../cpp/simplex.cc
 
 export function chat_migrate_init(dbPath: string, dbKey: string, confirm: string): Promise<[bigint, string]>
+export function chat_migrate_init_queue(dbPath: string, dbKey: string, confirm: string, queueSize: number): Promise<[bigint, string]>
 export function chat_close_store(ctrl: bigint): Promise<string>
 export function chat_send_cmd(ctrl: bigint, cmd: string): Promise<string>
 export function chat_recv_msg_wait(ctrl: bigint, wait: number): Promise<string>
-export function chat_write_file(ctrl: bigint, path: string, buffer: ArrayBuffer): Promise<string>
-export function chat_read_file(path: string, key: string, nonce: string): Promise<ArrayBuffer>
+export function chat_write_file(ctrl: bigint, path: string, buffer: ArrayBuffer | Uint8Array): Promise<string>
+export function chat_read_file(path: string, key: string, nonce: string): Promise<Buffer>
 export function chat_encrypt_file(ctrl: bigint, fromPath: string, toPath: string): Promise<string>
 export function chat_decrypt_file(fromPath: string, key: string, nonce: string, toPath: string): Promise<string>

package/src/util.ts

@@ -53,8 +53,8 @@ export function botAddressSettings({addressSettings}: T.UserContactLink): BotAdd
   }
 }
 
-export function fromLocalProfile({displayName, fullName, shortDescr, image, contactLink, preferences, peerType}: T.LocalProfile): T.Profile {
-  const profile = {displayName, fullName, shortDescr, image, contactLink, preferences, peerType}
+export function fromLocalProfile({displayName, fullName, shortDescr, image, contactLink, preferences, peerType, contactDomain}: T.LocalProfile): T.Profile {
+  const profile = {displayName, fullName, shortDescr, image, contactLink, preferences, peerType, contactDomain: contactDomain && {domain: contactDomain.domain}}
   for (const key in profile) {
     if (typeof (profile as any)[key] === "undefined") delete (profile as any)[key]
   }
@@ -78,7 +78,7 @@ export interface BotCommand {
 export function ciBotCommand(chatItem: T.ChatItem): BotCommand | undefined {
   const msg = ciContentText(chatItem)?.trim()
   if (msg) {
-    const r = msg.match(/^\/([^\s]+)(.*)/)
+    const r = msg.match(/^\/([^\s]+)([\s\S]*)/)
     if (r && r.length >= 3) {
       return {keyword: r[1], params: r[2].trim()}
     }