Skip to content

Commit

Permalink
ADD v0.1.0-RC5
Browse files Browse the repository at this point in the history
  • Loading branch information
Jan Stabenow committed Feb 2, 2016
1 parent f1b0006 commit a0f7da8
Show file tree
Hide file tree
Showing 40 changed files with 1,013 additions and 622 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Dockerfile_armv7l
.git
.editorconfig
.gitignore
docs
node_modules
bin
db
Expand Down
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
gruntfile.js
170 changes: 170 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
{
"ecmaFeatures": {
"arrowFunctions": true,
"binaryLiterals": true,
"blockBindings": true,
"classes": true,
"defaultParams": true,
"destructuring": true,
"forOf": true,
"generators": true,
"modules": true,
"objectLiteralComputedProperties": true,
"objectLiteralDuplicateProperties": true,
"objectLiteralShorthandMethods": true,
"objectLiteralShorthandProperties": true,
"octalLiterals": true,
"regexUFlag": true,
"regexYFlag": true,
"spread": true,
"superInFunctions": true,
"templateStrings": true,
"unicodeCodePointEscapes": true,
"globalReturn": true,
"jsx": true
},
"rules": {
"accessor-pairs": 2,
"block-scoped-var": 2,
"complexity": [0, 11],
"curly": 2,
"default-case": 2,
"dot-location": [2, "property"],
"dot-notation": 2,
"eqeqeq": 2,
"no-alert": 2,
"no-caller": 2,
"no-case-declarations": 2,
"no-div-regex": 2,
"no-else-return": 2,
"no-empty-label": 2,
"no-eq-null": 2,
"no-eval": 2,
"no-extend-native": 2,
"no-extra-bind": 2,
"no-fallthrough": 2,
"no-floating-decimal": 2,
"no-implicit-coercion": 2,
"no-implied-eval": 2,
"no-iterator": 2,
"no-labels": 2,
"no-lone-blocks": 2,
"no-loop-func": 2,
"no-multi-spaces": 2,
"no-multi-str": 2,
"no-native-reassign": 2,
"no-new": 2,
"no-new-func": 2,
"no-new-wrappers": 2,
"no-octal": 2,
"no-octal-escape": 2,
"no-param-reassign": 2,
"no-process-env": 2,
"no-proto": 2,
"no-redeclare": 2,
"no-return-assign": 2,
"no-script-url": 2,
"no-self-compare": 2,
"no-sequences": 2,
"no-throw-literal": 2,
"no-unused-expressions": 2,
"no-use-before-define": 2,
"no-useless-call": 2,
"no-useless-concat": 2,
"no-void": 2,
"no-warning-comments": [0, {"terms": ["todo", "fixme"], "location": "start"}],
"no-with": 2,
"radix": 2,
"vars-on-top": 2,
"wrap-iife": 2,
"yoda": 2,
"init-declarations": [2, "always"],
"no-catch-shadow": 2,
"no-delete-var": 2,
"no-label-var": 2,
"no-shadow": 2,
"no-shadow-restricted-names": 2,
"no-undef": 2,
"no-undef-init": 2,
"no-undefined": 2,
"no-unused-vars": 2,
"no-use-before-define": 2,
"callback-return": 2,
"global-require": 2,
"handle-callback-err": 2,
"no-mixed-requires": 2,
"no-new-require": 2,
"no-path-concat": 2,
"no-process-exit": 2,
"array-bracket-spacing": [2, "always"],
"block-spacing": [2, "always"],
"brace-style": 2,
"camelcase": 2,
"comma-spacing": [2, {"before": false, "after": true}],
"comma-style": [2, "last"],
"computed-property-spacing": [2, "never"],
"consistent-this": [2, "that"],
"eol-last": 2,
"func-names": 2,
"indent": [2,4],
"key-spacing": [2, {"beforeColon": false, "afterColon": true}],
"keyword-spacing": 2,
"linebreak-style": 2,
"lines-around-comment": [2, { "beforeBlockComment": true, "beforeLineComment": true }],
"max-depth": [2, 5],
"max-len": [2, 80, 4, {"ignoreUrls": true}],
"max-nested-callbacks": [2, 3],
"max-params": [2, 4],
"max-statements": [2, 10],
"new-cap": 2,
"new-parens": 2,
"newline-after-var": 2,
"no-array-constructor": 2,
"no-bitwise": 2,
"no-continue": 2,
"no-inline-comments": 2,
"no-lonely-if": 2,
"no-mixed-spaces-and-tabs": 2,
"no-multiple-empty-lines": [0, {"max": 2}],
"no-negated-condition": 2,
"no-nested-ternary": 2,
"no-new-object": 2,
"no-plusplus": 2,
"no-restricted-syntax": 2,
"no-whitespace-before-property": 2,
"no-spaced-func": 2,
"no-trailing-spaces": 2,
"no-unneeded-ternary": 2,
"object-curly-spacing": [2, "never"],
"one-var": [2, "never"],
"operator-assignment": [2, "never"],
"operator-linebreak": [2, "after"],
"padded-blocks": [2, "never"],
"quote-props": [2, "always"],
"quotes": [2, "single"],
"require-jsdoc": [2, {
"require": {
"FunctionDeclaration": true,
"MethodDefinition": false,
"ClassDeclaration": false
}
}],
"semi-spacing": 2,
"semi": [2, "always"],
"sort-vars": 2,
"sort-imports": 2,
"space-before-blocks": 2,
"space-before-function-paren": 2,
"space-in-parens": [2, "never"],
"space-infix-ops": 2,
"space-unary-ops": 2,
"spaced-comment": [2, "always"],
"wrap-regex": 2
},
"env": {
"es6": true,
"node": true,
"browser": true
},
"extends": "eslint:recommended"
}
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,3 @@ static/webserver/public/libs/**
db/**
heapdump
*.map
docs
_site
9 changes: 0 additions & 9 deletions .jshintrc

This file was deleted.

14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
## Changes from 0.1.0-RC4.1 to 0.1.0-RC5

* updated NPM packages, NGINX to 1.9.9 and FFmpeg to 2.8.5
* restructed frontend (WebsocketService, more ECMA6, ServiceFactory, logger as Angular-Service)
* cleanup NPM dep.
* expanded ESLint ruleset and first code optimizations
* added NGINX process monitoring
* cleanup JSONDB
* implemented input-field validation for RTSP/RTMP addresses

## Changes from 0.1.0-RC4 to 0.1.0-RC4.1

* added missing config of v0.1.0-RC4

## Changes from 0.1.0-RC3 to 0.1.0-RC4

* added https sources to Dockerfiles (thx @ [nodiscc](https://github.com/nodiscc))
Expand Down
16 changes: 9 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ FROM node:4.2.6-slim

MAINTAINER datarhei <[email protected]>

ENV FFMPEG_VERSION 2.8.1
ENV FFMPEG_VERSION 2.8.5
ENV YASM_VERSION 1.3.0
ENV LAME_VERSION 3_99_5
ENV NGINX_VERSION 1.8.0
ENV NGINX_VERSION 1.9.9
ENV NGINX_RTMP_VERSION 1.1.7

ENV SRC /usr/local
Expand All @@ -16,7 +16,7 @@ ENV BUILDDEPS "autoconf automake gcc g++ libtool make nasm zlib1g-dev libssl-dev

RUN rm -rf /var/lib/apt/lists/* && \
apt-get update && \
apt-get install -y curl wget git libpcre3 tar ${BUILDDEPS}
apt-get install -y --force-yes curl wget git libpcre3 tar ${BUILDDEPS}

# yasm
RUN DIR=$(mktemp -d) && cd ${DIR} && \
Expand Down Expand Up @@ -57,7 +57,8 @@ RUN DIR=$(mktemp -d) && cd ${DIR} && \
cd ffmpeg-${FFMPEG_VERSION} && \
./configure --prefix="${SRC}" --extra-cflags="-I${SRC}/include" --extra-ldflags="-L${SRC}/lib" --bindir="${SRC}/bin" \
--extra-libs=-ldl --enable-version3 --enable-libmp3lame --enable-libx264 --enable-gpl \
--enable-postproc --enable-nonfree --enable-avresample --disable-debug --enable-small --enable-openssl && \
--enable-postproc --enable-nonfree --enable-avresample --disable-debug --enable-small --enable-openssl \
--disable-doc --disable-ffserver && \
make && \
make install && \
make distclean && \
Expand All @@ -82,15 +83,16 @@ RUN DIR=$(mktemp -d) && cd ${DIR} && \
rm -rf ${DIR}

RUN apt-get purge -y --auto-remove ${BUILDDEPS} && \
apt-get install -y git && \
apt-get install -y --force-yes git && \
rm -rf /tmp/*

COPY . /restreamer
WORKDIR /restreamer

RUN npm install -g bower grunt-bower grunt-cli public-ip && \
RUN npm install -g bower grunt-cli public-ip [email protected] && \
npm install && \
grunt build
grunt build && \
npm prune --production

ENV RESTREAMER_USERNAME admin
ENV RESTREAMER_PASSWORD datarhei
Expand Down
10 changes: 6 additions & 4 deletions Dockerfile_armv6l
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ MAINTAINER datarhei <[email protected]>
ENV NODE_VERSION 4.2.6
ENV NPM_VERSION 2.14.12

ENV FFMPEG_VERSION 2.8.1
ENV FFMPEG_VERSION 2.8.5
ENV YASM_VERSION 1.3.0
ENV LAME_VERSION 3_99_5
ENV NGINX_VERSION 1.8.0
ENV NGINX_VERSION 1.9.9
ENV NGINX_RTMP_VERSION 1.1.7

ENV SRC /usr/local
Expand Down Expand Up @@ -70,7 +70,8 @@ RUN DIR=$(mktemp -d) && cd ${DIR} && \
cd ffmpeg-${FFMPEG_VERSION} && \
./configure --prefix="${SRC}" --extra-cflags="-I${SRC}/include" --extra-ldflags="-L${SRC}/lib" --bindir="${SRC}/bin" \
--extra-libs=-ldl --enable-version3 --enable-libmp3lame --enable-libx264 --enable-gpl \
--enable-postproc --enable-nonfree --enable-avresample --disable-debug --enable-small --enable-openssl && \
--enable-postproc --enable-nonfree --enable-avresample --disable-debug --enable-small --enable-openssl \
--disable-doc --disable-ffserver && \
make && \
make install && \
make distclean && \
Expand Down Expand Up @@ -105,7 +106,8 @@ WORKDIR /restreamer

RUN npm install -g bower grunt-bower grunt-cli public-ip && \
npm install && \
grunt build
grunt build && \
npm prune --production

ENV RESTREAMER_USERNAME admin
ENV RESTREAMER_PASSWORD datarhei
Expand Down
10 changes: 6 additions & 4 deletions Dockerfile_armv7l
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ MAINTAINER datarhei <[email protected]>
ENV NODE_VERSION 4.2.6
ENV NPM_VERSION 2.14.12

ENV FFMPEG_VERSION 2.8.1
ENV FFMPEG_VERSION 2.8.5
ENV YASM_VERSION 1.3.0
ENV LAME_VERSION 3_99_5
ENV NGINX_VERSION 1.8.0
ENV NGINX_VERSION 1.9.9
ENV NGINX_RTMP_VERSION 1.1.7

ENV SRC /usr/local
Expand Down Expand Up @@ -70,7 +70,8 @@ RUN DIR=$(mktemp -d) && cd ${DIR} && \
cd ffmpeg-${FFMPEG_VERSION} && \
./configure --prefix="${SRC}" --extra-cflags="-I${SRC}/include" --extra-ldflags="-L${SRC}/lib" --bindir="${SRC}/bin" \
--extra-libs=-ldl --enable-version3 --enable-libmp3lame --enable-libx264 --enable-gpl \
--enable-postproc --enable-nonfree --enable-avresample --disable-debug --enable-small --enable-openssl && \
--enable-postproc --enable-nonfree --enable-avresample --disable-debug --enable-small --enable-openssl \
--disable-doc --disable-ffserver && \
make && \
make install && \
make distclean && \
Expand Down Expand Up @@ -103,7 +104,8 @@ WORKDIR /restreamer

RUN npm install -g bower grunt-bower grunt-cli public-ip && \
npm install && \
grunt build
grunt build && \
npm prune --production

ENV RESTREAMER_USERNAME admin
ENV RESTREAMER_PASSWORD datarhei
Expand Down
9 changes: 1 addition & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,7 @@ Datarhei/Restreamer offers smart free video streaming in real time. Stream H.264
- <a target= "_blank" href="https://www.docker.com/">Docker</a> and <a target= "_blank" href="https://kitematic.com/">Kitematic (Docker-Toolbox)</a> optimizations and very easy installation

##Roadmap
- RC5 (planned 2.1.2016)
- start writing tests
- input-validation
- optimizing scope of stats
- cleanup JSONDB
- start restructuring code
- cleanup packages
- NGINX process monitor
- RC6 (tba)

##Documentation
Documentation is available on [Datarhei/Restreamer GitHub pages](https://datarhei.github.io/restreamer/).
Expand Down
10 changes: 5 additions & 5 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "Restreamer",
"version": "0.1.0-RC4.1",
"version": "0.1.0-RC5",
"license": "Apache-2.0",
"dependencies": {
"bootstrap": "3.3.6",
"jquery": "2.1.4",
"jquery": "2.2.0",
"html5shiv": "3.7.3",
"respond": "1.4.2",
"angular-bootstrap": "~0.14.3",
"angular-animate": "1.4.8",
"angular-animate": "1.4.9",
"ui-router": "~0.2.15",
"angular-translate": "~2.8.1",
"angular-translate-loader-static-files": "~2.8.1"
"angular-translate": "~2.9.0",
"angular-translate-loader-static-files": "~2.9.0"
},
"resolutions": {
"angular": "1.4.8",
Expand Down
Loading

0 comments on commit a0f7da8

Please sign in to comment.