Upgrade dependencies

.dockerignore

@@ -0,0 +1,9 @@
+**/.git/
+**/.github/
+**/node_modules/
+
+**/Dockerfile
+**/Dockerfile.*
+
+**/.env.*.local
+**/.env.local

.github/workflows/release.yml

@@ -112,8 +112,60 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
+    - uses: docker/setup-qemu-action@v1
+    - uses: docker/setup-buildx-action@v1
     - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v2
       with:
-        node-version: '18.x'
-    - run: DOCKER_PASSWORD=${{ secrets.DOCKERHUB_TOKEN }} DOCKER_USERNAME=${{ secrets.DOCKERHUB_USERNAME }} bash scripts/docker.sh
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+    - name: Extract metadata (tags, labels) for Docker
+      id: meta
+      uses: docker/metadata-action@v4
+      with:
+        images: deepstreamio/deepstream.io
+        flavor: |
+          latest=true
+        tags: |
+          type=semver,pattern={{version}}
+    - name: Build and push Docker image
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        file: Dockerfile
+        push: true
+        platforms: linux/amd64,linux/arm64
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}
+
+  docker-alpine:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: docker/setup-qemu-action@v1
+    - uses: docker/setup-buildx-action@v1
+    - uses: actions/checkout@v3
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+    - name: Extract metadata (tags, labels) for Docker
+      id: meta
+      uses: docker/metadata-action@v4
+      with:
+        images: deepstreamio/deepstream.io
+        flavor: |
+          latest=true
+          suffix=-alpine,onlatest=true
+        tags: |
+          type=semver,pattern={{version}}
+    - name: Build and push Docker image
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        file: Dockerfile.alpine
+        push: true
+        platforms: linux/amd64,linux/arm64
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -1,12 +1,13 @@
-FROM node:10
-
+FROM node:18 as builder
+WORKDIR /app
 # RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
 # RUN unzip awscliv2.zip
 # RUN ./aws/install
 
 COPY package*.json ./
 
-RUN npm install --production \
+RUN npm ci
+RUN npm install --omit=dev \
     @deepstream/cache-redis \
     # @deepstream/cache-memcached \
     # @deepstream/cache-hazelcast \
@@ -18,11 +19,17 @@ RUN npm install --production \
     @deepstream/logger-winston \
     @deepstream/plugin-aws
 
-COPY . ./
+COPY . .
+
+RUN npm run tsc
+
+FROM node:18
+WORKDIR /usr/local/deepstream
+COPY --from=builder /app/node_modules/ ./node_modules
+COPY --from=builder /app/dist/ .
 
 EXPOSE 6020
 EXPOSE 8080
 EXPOSE 9229
 
 CMD ["node", "./bin/deepstream.js", "start", "--inspect=0.0.0.0:9229"]
-

Dockerfile.alpine

@@ -0,0 +1,37 @@
+FROM node:18-alpine as builder
+WORKDIR /app
+# RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+# RUN unzip awscliv2.zip
+# RUN ./aws/install
+
+COPY package*.json ./
+
+RUN npm ci
+RUN npm install --omit=dev \
+    @deepstream/cache-redis \
+    # @deepstream/cache-memcached \
+    # @deepstream/cache-hazelcast \
+    @deepstream/clusternode-redis \
+    @deepstream/storage-mongodb \
+    @deepstream/storage-rethinkdb \
+    @deepstream/storage-elasticsearch \
+    @deepstream/storage-postgres \
+    @deepstream/logger-winston \
+    @deepstream/plugin-aws
+
+RUN npm uninstall --save uWebSockets.js
+
+COPY . .
+
+RUN npm run tsc
+
+FROM node:18-alpine
+WORKDIR /usr/local/deepstream
+COPY --from=builder /app/node_modules/ ./node_modules
+COPY --from=builder /app/dist/ .
+
+EXPOSE 6020
+EXPOSE 8080
+EXPOSE 9229
+
+CMD ["node", "./bin/deepstream.js", "start", "--inspect=0.0.0.0:9229"]

bin/deepstream-cluster.ts

@@ -1,14 +1,8 @@
-import * as commander from 'commander'
+import { Command } from 'commander'
 import * as cluster from 'cluster'
 const numCPUs = require('os').cpus().length
 import { EVENT } from '@deepstream/types'
 
-// work-around for:
-// TS4023: Exported variable 'command' has or is using name 'local.Command'
-// from external module "node_modules/commander/typings/index" but cannot be named.
-// tslint:disable-next-line: no-empty-interface
-export interface Command extends commander.Command { }
-
 export const verticalCluster = (program: Command) => {
   program
     .command('cluster')
@@ -80,4 +74,4 @@ function action () {
           process.exit(1)
         }
     }
-}
+}

bin/deepstream-daemon.ts

@@ -1,12 +1,6 @@
 // @ts-ignore
 import * as dsDaemon from '../src/service/daemon'
-import * as commander from 'commander'
-
-// work-around for:
-// TS4023: Exported variable 'command' has or is using name 'local.Command'
-// from external module "node_modules/commander/typings/index" but cannot be named.
-// tslint:disable-next-line: no-empty-interface
-export interface Command extends commander.Command { }
+import { Command } from 'commander'
 
 export const daemon = (program: Command) => {
   program

bin/deepstream-hash.ts

@@ -1,13 +1,7 @@
 import * as jsYamlLoader from '../src/config/js-yaml-loader'
-import * as commander from 'commander'
+import { Command } from 'commander'
 import { createHash } from '../src/utils/utils'
 
-// work-around for:
-// TS4023: Exported variable 'command' has or is using name 'local.Command'
-// from external module "node_modules/commander/typings/index" but cannot be named.
-// tslint:disable-next-line: no-empty-interface
-export interface Command extends commander.Command { }
-
 export const hash = (program: Command) => {
   program
     .command('hash [password]')

bin/deepstream-info.ts

@@ -1,13 +1,7 @@
 import * as jsYamlLoader from '../src/config/js-yaml-loader'
-import * as commander from 'commander'
+import { Command } from 'commander'
 import { getDSInfo } from '../src/config/ds-info'
 
-// work-around for:
-// TS4023: Exported variable 'command' has or is using name 'local.Command'
-// from external module "node_modules/commander/typings/index" but cannot be named.
-// tslint:disable-next-line: no-empty-interface
-export interface Command extends commander.Command { }
-
 export const info = (program: Command) => {
   program
     .command('info')

bin/deepstream-nginx.ts

@@ -1,16 +1,10 @@
 // @ts-ignore
 import * as dsService from '../src/service/service'
-import * as commander from 'commander'
+import { Command } from 'commander'
 import { writeFileSync } from 'fs'
 import * as jsYamlLoader from '../src/config/js-yaml-loader'
 import * as fileUtil from '../src/config/file-utils'
 
-// work-around for:
-// TS4023: Exported variable 'command' has or is using name 'local.Command'
-// from external module "node_modules/commander/typings/index" but cannot be named.
-// tslint:disable-next-line: no-empty-interface
-export interface Command extends commander.Command { }
-
 export const nginx = (program: Command) => {
   program
     .command('nginx')

bin/deepstream-service.ts

@@ -1,12 +1,6 @@
 // @ts-ignore
 import * as dsService from '../src/service/service'
-import * as commander from 'commander'
-
-// work-around for:
-// TS4023: Exported variable 'command' has or is using name 'local.Command'
-// from external module "node_modules/commander/typings/index" but cannot be named.
-// tslint:disable-next-line: no-empty-interface
-export interface Command extends commander.Command { }
+import { Command } from 'commander'
 
 export const service = (program: Command) => {
   program

bin/deepstream-start.ts

@@ -1,15 +1,9 @@
-import * as commander from 'commander'
+import { Command } from 'commander'
 import { EVENT } from '@deepstream/types'
 
-// work-around for:
-// TS4023: Exported variable 'command' has or is using name 'local.Command'
-// from external module "node_modules/commander/typings/index" but cannot be named.
-// tslint:disable-next-line: no-empty-interface
-export interface Command extends commander.Command { }
-
 export const start = (program: Command) => {
   program
-    .command('start')
+    .command('start', { isDefault: true })
     .description('start a deepstream server')
 
     .option('-c, --config [file]', 'configuration file, parent directory will be used as prefix for other config files')
@@ -51,7 +45,7 @@ function action () {
         ds.stop()
       })
   } catch (err) {
-    console.error(err.toString())
+    console.error(err?.toString())
     process.exit(1)
   }
 }

bin/deepstream.ts

@@ -24,7 +24,3 @@ verticalCluster(program)
 nginx(program)
 
 program.parse(process.argv)
-
-if (program.rawArgs.length <= 2) {
-  program.emit('command:start')
-}