wip

Author: jaime-ez

package.json

@@ -12,6 +12,10 @@
   "directories": {
     "test": "test"
   },
+  "pkg": {
+    "scripts": "./dist/src/config/*.js",
+    "assets": "./dist/ascii-logo.txt"
+  },
   "mocha": {
     "reporter": "dot",
     "require": [
@@ -65,8 +69,8 @@
     "needle": "^2.5.2",
     "pino": "^6.7.0",
     "source-map-support": "^0.5.19",
-    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.5.0",
     "uuid": "^8.3.1",
+    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.5.0",
     "ws": "^7.5.6"
   },
   "devDependencies": {
@@ -75,6 +79,7 @@
     "@types/body-parser": "^1.19.0",
     "@types/content-type": "^1.1.3",
     "@types/cucumber": "^6.0.1",
+    "@types/glob": "^7.2.0",
     "@types/js-yaml": "^3.12.5",
     "@types/mkdirp": "^1.0.1",
     "@types/mocha": "^8.0.4",
@@ -94,8 +99,8 @@
     "istanbul": "^0.4.5",
     "mocha": "^8.2.1",
     "n0p3": "^1.0.2",
-    "nexe": "^3.3.7",
     "nyc": "^15",
+    "pkg": "^5.5.1",
     "proxyquire": "^2.1.3",
     "sinon": "^9.2.1",
     "sinon-chai": "^3.5.0",

scripts/package.sh

@@ -14,13 +14,7 @@ DEEPSTREAM_PACKAGE=${PACKAGE_DIR}/deepstream.io
 GIT_BRANCH=$( git rev-parse --abbrev-ref HEAD )
 CREATE_DISTROS=false
 
-NODE_SOURCE="nexe_node/node/$NODE_VERSION_WITHOUT_V/node-v$NODE_VERSION_WITHOUT_V"
-
-EXTENSION=""
-if [[ ${OS} = "win32" ]]; then
-    EXTENSION=".exe"
-fi
-EXECUTABLE_NAME="build/deepstream$EXTENSION"
+EXECUTABLE_NAME="build/deepstream"
 
 # Needed even for void builds for travis deploy to pass
 mkdir -p build
@@ -31,17 +25,8 @@ if ! [[ ${NODE_VERSION_WITHOUT_V} == ${LTS_VERSION}* ]]; then
 fi
 
 if [[ -z $1  ]]; then
-    if ! [[ ${TRAVIS_BRANCH} = 'master' ]] && ! [[ ${APPVEYOR_REPO_BRANCH} = 'master' ]] && ! [[ ${GIT_BRANCH} = 'master' ]]; then
+    if ! [[ ${GIT_BRANCH} = 'master' ]]; then
         echo "Running on branch ${GIT_BRANCH}"
-        if [[ -z ${TRAVIS_TAG} ]] && [[ -z ${APPVEYOR_REPO_TAG} ]]; then
-            echo "Only runs on tags or master"
-            exit
-        elif [[ ${APPVEYOR_REPO_TAG} = false ]]; then
-            echo "On appveyor, not a tag or master"
-            exit
-        else
-            echo "Running on tag $TRAVIS_TAG $APPVEYOR_REPO_TAG"
-        fi
     else
         echo "Running on master"
     fi
@@ -72,12 +57,6 @@ function compile {
     echo "Generating meta.json"
     node scripts/details.js META
 
-    # Nexe Patches
-    echo "Nexe Patches for Browserify, copying stub versions of optional installs since they aern't bundled anyway"
-
-    echo "Stubbing xml2js for needle"
-    mkdir -p node_modules/xml2js && echo "throw new Error()" >> node_modules/xml2js/index.js
-
     # Creating package structure
     rm -rf build/${PACKAGE_VERSION}
     mkdir -p ${DEEPSTREAM_PACKAGE}
@@ -117,7 +96,7 @@ function compile {
     cd -
 
     echo "Creating '$EXECUTABLE_NAME', this will take a while..."
-    NODE_VERSION_WITHOUT_V=${NODE_VERSION_WITHOUT_V} EXECUTABLE_NAME=${EXECUTABLE_NAME} node scripts/nexe.js > /dev/null &
+    LTS=${LTS_VERSION} OS=${OS} EXECUTABLE_NAME=${EXECUTABLE_NAME} node scripts/pkg.js
 
     PROC_ID=$!
     SECONDS=0;
@@ -129,9 +108,9 @@ function compile {
     echo ""
 
     if wait ${pid}; then
-        echo -e "\tNexe Build Succeeded"
+        echo -e "\tPkg Build Succeeded"
     else
-        echo -e "\tNexe Build Failed"
+        echo -e "\tPkg Build Failed"
         exit 1
     fi
 

scripts/pkg.js

@@ -0,0 +1,30 @@
+const { exec } = require('pkg')
+
+const LTS = process.env.LTS
+let OS = process.env.OS
+
+if (OS === 'win32') {
+  OS = 'win'
+}
+if (OS === 'darwin') {
+  OS = 'macos'
+}
+
+const target = 'node'+ LTS + '-' + OS
+
+console.log('TARGET', target);
+
+exec(
+  [
+    'package.json',
+    '--targets',
+    target,
+    '--output',
+    process.env.EXECUTABLE_NAME,
+    '--options',
+    '--max-old-space-size=8192',
+    '--compress',
+    'GZip'
+  ]).then(() => {
+  console.log('success')
+})

src/config/ds-info.ts

@@ -29,7 +29,7 @@ export const getDSInfo = (libDir?: string) => {
 const fetchLibs = (libDir: string, meta: any) => {
     const directory = libDir || 'lib'
     const files = glob.sync(path.join(directory, '*', 'package.json'))
-    meta.libs = files.map((filePath) => {
+    meta.libs = files.map((filePath: any) => {
         const pkg = fs.readFileSync(filePath, 'utf8')
         const object = JSON.parse(pkg)
         return `${object.name}:${object.version}`