fix: expose versions from .h instead of .ts

Author: Bilb

.gitignore

@@ -12,4 +12,5 @@
 .yarn/
 *.cjs
 *.mjs
-src/version.ts
+
+/src/version.h

.prettierignore

@@ -1 +1 @@
-src/version.ts
+/src/version.h

package.json

@@ -2,7 +2,7 @@
   "main": "index.js",
   "name": "libsession_util_nodejs",
   "description": "Wrappers for the Session Util Library",
-  "version": "0.4.24",
+  "version": "0.4.25",
   "license": "GPL-3.0",
   "author": {
     "name": "Oxen Project",

prepare_release.sh

@@ -9,7 +9,7 @@ read_char() {
 }
 
 
-rm -f ./libsession_util_nodejs*.tar.gz
+rm -f ./libsession_util_nodejs*.tar.gz temp_extract
 virtualenv venv
 . venv/bin/activate
 pip install git-archive-all
@@ -29,12 +29,19 @@ echo "Continuing..."
 yarn dirty_sed
 
 echo "Building tar archive of source..."
-python3 build_release_archive.py libsession_util_nodejs-v$PACKAGE_VERSION.tar.gz
+# src/version.h is not tracked in git, so we need to force include it
+mkdir temp_extract
+tar -xzf libsession_util_nodejs-v$PACKAGE_VERSION.tar.gz -C temp_extract --strip-components=1
+rm libsession_util_nodejs-v$PACKAGE_VERSION.tar.gz
+cp src/version.h temp_extract/src/
+tar -cf libsession_util_nodejs-v$PACKAGE_VERSION.tar -C temp_extract .
+gzip libsession_util_nodejs-v$PACKAGE_VERSION.tar
+
 echo "tar archive size:"
 du -sh libsession_util_nodejs*.tar.gz
 
 echo "Creating draft release on github $PACKAGE_VERSION..."
-GH_RELEASE_URL=$(gh release create v$PACKAGE_VERSION -t v$PACKAGE_VERSION --draft --latest --generate-notes)
+GH_RELEASE_URL=$(gh release create v$PACKAGE_VERSION -t v$PACKAGE_VERSION --latest --generate-notes)
 echo "Uploading tar archive to release $PACKAGE_VERSION..."
 gh release upload v$PACKAGE_VERSION libsession_util_nodejs-v$PACKAGE_VERSION.tar.gz
 echo "GH_RELEASE_URL: $GH_RELEASE_URL"

src/constants.cpp

@@ -4,6 +4,7 @@
 #include "session/config/groups/info.hpp"
 #include "session/config/user_groups.hpp"
 #include "session/version.h"
+#include "version.h"
 
 namespace session::nodeapi {
 ConstantsWrapper::ConstantsWrapper(const Napi::CallbackInfo& info) :
@@ -35,6 +36,14 @@ Napi::Object ConstantsWrapper::Init(Napi::Env env, Napi::Object exports) {
              ObjectWrap::StaticValue(
                      "LIBSESSION_UTIL_VERSION",
                      Napi::String::New(env, LIBSESSION_UTIL_VERSION_FULL),
+                     napi_enumerable),
+             ObjectWrap::StaticValue(
+                     "LIBSESSION_NODEJS_VERSION",
+                     Napi::String::New(env, LIBSESSION_NODEJS_VERSION),
+                     napi_enumerable),
+             ObjectWrap::StaticValue(
+                     "LIBSESSION_NODEJS_COMMIT",
+                     Napi::String::New(env, LIBSESSION_NODEJS_COMMIT),
                      napi_enumerable)});
 
     // export object as javascript module

types/shared.d.ts

@@ -156,6 +156,18 @@ declare module 'libsession_util_nodejs' {
      * BASE_URL_MAX_LENGTH + '/r/' + ROOM_MAX_LENGTH + qs_pubkey.size() + hex pubkey + null terminator
      */
     COMMUNITY_FULL_URL_MAX_LENGTH: number;
+    /**
+     * A string that looks like libsession-util v1.2.0-nogit
+     */
+    LIBSESSION_UTIL_VERSION: string;
+    /**
+     * A string that looks like "0.4.24"
+     */
+    LIBSESSION_NODEJS_VERSION: string;
+    /**
+     * A string corresponding to the full hash of the commit
+     */
+    LIBSESSION_NODEJS_COMMIT: string;
   };
 
   export const CONSTANTS: ConstantsType;

update_version.sh

@@ -2,17 +2,19 @@
 set -e
 # set -x
 
-VERSION_FILE="src/version.ts"
-rm $VERSION_FILE
+VERSION_FILE="src/version.h"
+
+rm -f $VERSION_FILE
+
 export LIBSESSION_NODEJS_VERSION=$(node -p "require('./package.json').version")
-# sadly, this is most likely only working on unix
-LIBSESSION_NODEJS_COMMIT_SHA=$(git rev-parse HEAD)
+LIBSESSION_NODEJS_COMMIT=$(git rev-parse HEAD)
 
 echo "Updating LIBSESSION_NODEJS_VERSION: $LIBSESSION_NODEJS_VERSION"
-echo "Updating LIBSESSION_NODEJS_COMMIT_SHA: $LIBSESSION_NODEJS_COMMIT_SHA"
+echo "Updating LIBSESSION_NODEJS_COMMIT: $LIBSESSION_NODEJS_COMMIT"
+
 
-echo "export const LIBSESSION_NODEJS_VERSION = '$LIBSESSION_NODEJS_VERSION';" > $VERSION_FILE
-echo "export const LIBSESSION_NODEJS_COMMIT_SHA = '$LIBSESSION_NODEJS_COMMIT_SHA';" >> $VERSION_FILE
+echo "const char* LIBSESSION_NODEJS_VERSION = \"$LIBSESSION_NODEJS_VERSION\";" > $VERSION_FILE
+echo "const char* LIBSESSION_NODEJS_COMMIT = \"$LIBSESSION_NODEJS_COMMIT\";" >> $VERSION_FILE
 
 echo "\n'$VERSION_FILE' updated to:"
 cat $VERSION_FILE