From 46f911c075fc990e11288a1e20208e68587e18b3 Mon Sep 17 00:00:00 2001 From: Christian Basler Date: Fri, 8 Dec 2017 07:27:42 +0100 Subject: [PATCH] Migrated project to Kotlin and created a new frontend --- .gitignore | 2 +- build.gradle | 65 +++- frontend/.angular-cli.json | 57 +++ frontend/.editorconfig | 13 + frontend/.gitignore | 42 ++ frontend/README.md | 28 ++ frontend/build.gradle | 16 + frontend/e2e/app.e2e-spec.ts | 14 + frontend/e2e/app.po.ts | 11 + frontend/e2e/tsconfig.e2e.json | 12 + frontend/karma.conf.js | 44 +++ frontend/package.json | 53 +++ frontend/protractor.conf.js | 30 ++ frontend/src/app/app.component.css | 0 frontend/src/app/app.component.html | 10 + frontend/src/app/app.component.spec.ts | 32 ++ frontend/src/app/app.component.ts | 10 + frontend/src/app/app.module.ts | 35 ++ frontend/src/app/app.routes.ts | 15 + .../app/broadcast/broadcast.component.html | 16 + .../app/broadcast/broadcast.component.scss | 4 + .../app/broadcast/broadcast.component.spec.ts | 25 ++ .../src/app/broadcast/broadcast.component.ts | 40 ++ frontend/src/app/status/status.component.html | 3 + frontend/src/app/status/status.component.scss | 4 + .../src/app/status/status.component.spec.ts | 25 ++ frontend/src/app/status/status.component.ts | 22 ++ frontend/src/assets/.gitkeep | 0 frontend/src/environments/environment.prod.ts | 3 + frontend/src/environments/environment.ts | 8 + frontend/src/favicon.ico | Bin 0 -> 5430 bytes frontend/src/index.html | 16 + frontend/src/main.ts | 11 + frontend/src/polyfills.ts | 72 ++++ frontend/src/styles.css | 6 + frontend/src/test.ts | 32 ++ frontend/src/tsconfig.app.json | 13 + frontend/src/tsconfig.spec.json | 20 + frontend/src/typings.d.ts | 5 + frontend/tsconfig.json | 20 + frontend/tslint.json | 130 +++++++ gradle/wrapper/gradle-wrapper.jar | Bin 51017 -> 53637 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 10 +- settings.gradle | 4 +- src/main/docker/Dockerfile | 6 + .../dissem/bitmessage/server/Constants.java | 13 - .../dissem/bitmessage/server/Converter.java | 72 ---- .../bitmessage/server/JabitServerConfig.java | 210 ---------- .../server/JabitServerController.java | 123 ------ .../server/ProofOfWorkRequestHandler.java | 155 -------- .../bitmessage/server/ServerListener.java | 181 --------- .../ch/dissem/bitmessage/server/Utils.java | 153 -------- .../ServerProofOfWorkRepository.java | 137 ------- .../ch/dissem/bitmessage/server/Constants.kt | 13 + .../ch/dissem/bitmessage/server/Converter.kt | 55 +++ .../server/JabitServerApplication.kt} | 26 +- .../bitmessage/server/JabitServerConfig.kt | 193 ++++++++++ .../server/JabitServerController.kt | 110 ++++++ .../server/ProofOfWorkRequestHandler.kt | 122 ++++++ .../bitmessage/server/ServerListener.kt | 171 ++++++++ .../bitmessage/server/ServletInitializer.kt} | 15 +- .../ch/dissem/bitmessage/server/Utils.kt | 129 +++++++ .../bitmessage/server/entities/Broadcasts.kt} | 15 +- .../bitmessage/server/entities/Message.kt} | 20 +- .../bitmessage/server/entities/Sender.kt} | 12 +- .../bitmessage/server/entities/Update.kt} | 12 +- .../repository/ServerProofOfWorkRepository.kt | 107 +++++ .../server/JabitServerApplicationTests.java | 18 - .../server/JabitServerApplicationTests.kt | 17 + webapp/.editorconfig | 21 - webapp/.gitattributes | 1 - webapp/.gitignore | 4 - webapp/.jscsrc | 5 - webapp/.jshintrc | 24 -- webapp/LICENSE.md | 19 - webapp/README.md | 364 ------------------ webapp/app/cache-config.json | 4 - webapp/app/elements/elements.html | 41 -- .../elements/message-list/message-list.html | 80 ---- webapp/app/elements/routing.html | 46 --- webapp/app/favicon.ico | Bin 611 -> 0 bytes webapp/app/images/touch/apple-touch-icon.png | Bin 5314 -> 0 bytes .../chrome-splashscreen-icon-384x384.png | Bin 11418 -> 0 bytes .../touch/chrome-touch-icon-192x192.png | Bin 6112 -> 0 bytes webapp/app/images/touch/icon-128x128.png | Bin 4117 -> 0 bytes webapp/app/images/touch/ms-icon-144x144.png | Bin 4469 -> 0 bytes .../ms-touch-icon-144x144-precomposed.png | Bin 4469 -> 0 bytes webapp/app/index.html | 145 ------- webapp/app/manifest.json | 29 -- webapp/app/robots.txt | 4 - webapp/app/scripts/app.js | 104 ----- webapp/app/styles/app-theme.html | 170 -------- webapp/app/styles/main.css | 14 - webapp/app/styles/shared-styles.html | 76 ---- webapp/app/sw-import.js | 10 - webapp/bower.json | 16 - webapp/build.gradle | 14 - webapp/gulpfile.js | 280 -------------- webapp/package.json | 39 -- webapp/styles/main.css | 14 - webapp/wct.conf.json | 8 - 102 files changed, 1924 insertions(+), 2675 deletions(-) create mode 100644 frontend/.angular-cli.json create mode 100644 frontend/.editorconfig create mode 100644 frontend/.gitignore create mode 100644 frontend/README.md create mode 100644 frontend/build.gradle create mode 100644 frontend/e2e/app.e2e-spec.ts create mode 100644 frontend/e2e/app.po.ts create mode 100644 frontend/e2e/tsconfig.e2e.json create mode 100644 frontend/karma.conf.js create mode 100644 frontend/package.json create mode 100644 frontend/protractor.conf.js create mode 100644 frontend/src/app/app.component.css create mode 100644 frontend/src/app/app.component.html create mode 100644 frontend/src/app/app.component.spec.ts create mode 100644 frontend/src/app/app.component.ts create mode 100644 frontend/src/app/app.module.ts create mode 100644 frontend/src/app/app.routes.ts create mode 100644 frontend/src/app/broadcast/broadcast.component.html create mode 100644 frontend/src/app/broadcast/broadcast.component.scss create mode 100644 frontend/src/app/broadcast/broadcast.component.spec.ts create mode 100644 frontend/src/app/broadcast/broadcast.component.ts create mode 100644 frontend/src/app/status/status.component.html create mode 100644 frontend/src/app/status/status.component.scss create mode 100644 frontend/src/app/status/status.component.spec.ts create mode 100644 frontend/src/app/status/status.component.ts create mode 100644 frontend/src/assets/.gitkeep create mode 100644 frontend/src/environments/environment.prod.ts create mode 100644 frontend/src/environments/environment.ts create mode 100644 frontend/src/favicon.ico create mode 100644 frontend/src/index.html create mode 100644 frontend/src/main.ts create mode 100644 frontend/src/polyfills.ts create mode 100644 frontend/src/styles.css create mode 100644 frontend/src/test.ts create mode 100644 frontend/src/tsconfig.app.json create mode 100644 frontend/src/tsconfig.spec.json create mode 100644 frontend/src/typings.d.ts create mode 100644 frontend/tsconfig.json create mode 100644 frontend/tslint.json create mode 100644 src/main/docker/Dockerfile delete mode 100644 src/main/java/ch/dissem/bitmessage/server/Constants.java delete mode 100644 src/main/java/ch/dissem/bitmessage/server/Converter.java delete mode 100644 src/main/java/ch/dissem/bitmessage/server/JabitServerConfig.java delete mode 100644 src/main/java/ch/dissem/bitmessage/server/JabitServerController.java delete mode 100644 src/main/java/ch/dissem/bitmessage/server/ProofOfWorkRequestHandler.java delete mode 100644 src/main/java/ch/dissem/bitmessage/server/ServerListener.java delete mode 100644 src/main/java/ch/dissem/bitmessage/server/Utils.java delete mode 100644 src/main/java/ch/dissem/bitmessage/server/repository/ServerProofOfWorkRepository.java create mode 100644 src/main/kotlin/ch/dissem/bitmessage/server/Constants.kt create mode 100644 src/main/kotlin/ch/dissem/bitmessage/server/Converter.kt rename src/main/{java/ch/dissem/bitmessage/server/JabitServerApplication.java => kotlin/ch/dissem/bitmessage/server/JabitServerApplication.kt} (60%) create mode 100644 src/main/kotlin/ch/dissem/bitmessage/server/JabitServerConfig.kt create mode 100644 src/main/kotlin/ch/dissem/bitmessage/server/JabitServerController.kt create mode 100644 src/main/kotlin/ch/dissem/bitmessage/server/ProofOfWorkRequestHandler.kt create mode 100644 src/main/kotlin/ch/dissem/bitmessage/server/ServerListener.kt rename src/main/{java/ch/dissem/bitmessage/server/ServletInitializer.java => kotlin/ch/dissem/bitmessage/server/ServletInitializer.kt} (65%) create mode 100644 src/main/kotlin/ch/dissem/bitmessage/server/Utils.kt rename src/main/{java/ch/dissem/bitmessage/server/entities/Broadcasts.java => kotlin/ch/dissem/bitmessage/server/entities/Broadcasts.kt} (71%) rename src/main/{java/ch/dissem/bitmessage/server/entities/Message.java => kotlin/ch/dissem/bitmessage/server/entities/Message.kt} (67%) rename src/main/{java/ch/dissem/bitmessage/server/entities/Sender.java => kotlin/ch/dissem/bitmessage/server/entities/Sender.kt} (78%) rename src/main/{java/ch/dissem/bitmessage/server/entities/Update.java => kotlin/ch/dissem/bitmessage/server/entities/Update.kt} (71%) create mode 100644 src/main/kotlin/ch/dissem/bitmessage/server/repository/ServerProofOfWorkRepository.kt delete mode 100644 src/test/java/ch/dissem/bitmessage/server/JabitServerApplicationTests.java create mode 100644 src/test/java/ch/dissem/bitmessage/server/JabitServerApplicationTests.kt delete mode 100644 webapp/.editorconfig delete mode 100644 webapp/.gitattributes delete mode 100644 webapp/.gitignore delete mode 100644 webapp/.jscsrc delete mode 100644 webapp/.jshintrc delete mode 100644 webapp/LICENSE.md delete mode 100644 webapp/README.md delete mode 100644 webapp/app/cache-config.json delete mode 100644 webapp/app/elements/elements.html delete mode 100644 webapp/app/elements/message-list/message-list.html delete mode 100644 webapp/app/elements/routing.html delete mode 100644 webapp/app/favicon.ico delete mode 100644 webapp/app/images/touch/apple-touch-icon.png delete mode 100644 webapp/app/images/touch/chrome-splashscreen-icon-384x384.png delete mode 100644 webapp/app/images/touch/chrome-touch-icon-192x192.png delete mode 100644 webapp/app/images/touch/icon-128x128.png delete mode 100644 webapp/app/images/touch/ms-icon-144x144.png delete mode 100644 webapp/app/images/touch/ms-touch-icon-144x144-precomposed.png delete mode 100644 webapp/app/index.html delete mode 100644 webapp/app/manifest.json delete mode 100644 webapp/app/robots.txt delete mode 100644 webapp/app/scripts/app.js delete mode 100644 webapp/app/styles/app-theme.html delete mode 100644 webapp/app/styles/main.css delete mode 100644 webapp/app/styles/shared-styles.html delete mode 100644 webapp/app/sw-import.js delete mode 100644 webapp/bower.json delete mode 100644 webapp/build.gradle delete mode 100644 webapp/gulpfile.js delete mode 100644 webapp/package.json delete mode 100644 webapp/styles/main.css delete mode 100644 webapp/wct.conf.json diff --git a/.gitignore b/.gitignore index 074809c..fc39b71 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ config.properties # Created by https://www.gitignore.io *.log +*.log.*.gz ### Gradle ### .gradle @@ -74,7 +75,6 @@ crashlytics-build.properties ### Eclipse ### *.pydevproject .metadata -.gradle bin/ tmp/ *.tmp diff --git a/build.gradle b/build.gradle index 0866233..68d80f1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,22 +1,33 @@ buildscript { + ext.kotlin_version = '1.2.0' ext { - springBootVersion = '1.3.0.M5' + springBootVersion = '2.0.0.M7' } repositories { mavenCentral() - maven { url "https://repo.spring.io/snapshot" } maven { url "https://repo.spring.io/milestone" } + jcenter() } dependencies { classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") + classpath('se.transmode.gradle:gradle-docker:1.2') + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version" + classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0' } } +group = 'dissem' + apply plugin: 'java' -apply plugin: 'eclipse-wtp' +apply plugin: 'kotlin' +apply plugin: 'kotlin-spring' +apply plugin: 'eclipse' apply plugin: 'idea' -apply plugin: 'spring-boot' +apply plugin: 'org.springframework.boot' apply plugin: 'io.spring.dependency-management' +apply plugin: 'docker' +apply plugin: 'com.github.ben-manes.versions' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -33,13 +44,13 @@ configurations { providedRuntime } -ext.jabitVersion = 'development-SNAPSHOT' +ext.jabitVersion = 'feature-refactoring-SNAPSHOT' dependencies { compile("org.springframework.boot:spring-boot-starter-hateoas") compile("org.springframework.boot:spring-boot-starter-jersey") compile("org.springframework.boot:spring-boot-starter-web") - compile("io.springfox:springfox-swagger2:2.0.2") - compile("io.springfox:springfox-swagger-ui:2.0.2") + compile("io.springfox:springfox-swagger2:2.7.0") + compile("io.springfox:springfox-swagger-ui:2.7.0") compile "ch.dissem.jabit:jabit-core:$jabitVersion" compile "ch.dissem.jabit:jabit-networking:$jabitVersion" @@ -49,10 +60,14 @@ dependencies { compile 'com.h2database:h2:1.4.194' - compile 'com.google.zxing:core:3.3.0' + compile 'com.google.zxing:core:3.3.1' providedRuntime("org.springframework.boot:spring-boot-starter-tomcat") testCompile("org.springframework.boot:spring-boot-starter-test") + compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" } @@ -63,13 +78,39 @@ eclipse { } } -task(copyWebapp, type: Copy, dependsOn: ":webapp:build") { - from(file('webapp/dist')) - into(file(buildDir.canonicalPath + '/resources/main/static')) +task buildDocker(type: Docker, dependsOn: build) { + push = true + applicationName = 'jabit-server' + dockerfile = file('src/main/docker/Dockerfile') + doFirst { + copy { + from jar + into stageDir + } + } } -build.dependsOn copyWebapp +jar { + baseName = 'jabit-server' + from('frontend/dist') { + //Public is a default supported Spring Boot resources directory. + into 'public' + } +} + +//frontend:build will be run before the processResources +processResources.dependsOn('frontend:build') task wrapper(type: Wrapper) { gradleVersion = '2.3' } +compileKotlin { + kotlinOptions { + jvmTarget = "1.8" + } +} +compileTestKotlin { + kotlinOptions { + jvmTarget = "1.8" + } +} diff --git a/frontend/.angular-cli.json b/frontend/.angular-cli.json new file mode 100644 index 0000000..c450520 --- /dev/null +++ b/frontend/.angular-cli.json @@ -0,0 +1,57 @@ +{ + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "project": { + "name": "jabit-server" + }, + "apps": [ + { + "root": "src", + "outDir": "dist", + "assets": [ + "assets", + "favicon.ico" + ], + "index": "index.html", + "main": "main.ts", + "polyfills": "polyfills.ts", + "test": "test.ts", + "tsconfig": "tsconfig.app.json", + "testTsconfig": "tsconfig.spec.json", + "prefix": "app", + "styles": [ + "styles.css" + ], + "scripts": [], + "environmentSource": "environments/environment.ts", + "environments": { + "dev": "environments/environment.ts", + "prod": "environments/environment.prod.ts" + } + } + ], + "e2e": { + "protractor": { + "config": "./protractor.conf.js" + } + }, + "lint": [ + { + "project": "src/tsconfig.app.json" + }, + { + "project": "src/tsconfig.spec.json" + }, + { + "project": "e2e/tsconfig.e2e.json" + } + ], + "test": { + "karma": { + "config": "./karma.conf.js" + } + }, + "defaults": { + "styleExt": "css", + "component": {} + } +} diff --git a/frontend/.editorconfig b/frontend/.editorconfig new file mode 100644 index 0000000..6e87a00 --- /dev/null +++ b/frontend/.editorconfig @@ -0,0 +1,13 @@ +# Editor configuration, see http://editorconfig.org +root = true + +[*] +charset = utf-8 +indent_style = space +indent_size = 2 +insert_final_newline = true +trim_trailing_whitespace = true + +[*.md] +max_line_length = off +trim_trailing_whitespace = false diff --git a/frontend/.gitignore b/frontend/.gitignore new file mode 100644 index 0000000..54bfd20 --- /dev/null +++ b/frontend/.gitignore @@ -0,0 +1,42 @@ +# See http://help.github.com/ignore-files/ for more about ignoring files. + +# compiled output +/dist +/tmp +/out-tsc + +# dependencies +/node_modules + +# IDEs and editors +/.idea +.project +.classpath +.c9/ +*.launch +.settings/ +*.sublime-workspace + +# IDE - VSCode +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json + +# misc +/.sass-cache +/connect.lock +/coverage +/libpeerconnection.log +npm-debug.log +testem.log +/typings + +# e2e +/e2e/*.js +/e2e/*.map + +# System Files +.DS_Store +Thumbs.db diff --git a/frontend/README.md b/frontend/README.md new file mode 100644 index 0000000..18d2527 --- /dev/null +++ b/frontend/README.md @@ -0,0 +1,28 @@ +# JabitServer + +This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.0.3. + +## Development server + +Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files. + +## Code scaffolding + +Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|module`. + +## Build + +Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build. + +## Running unit tests + +Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io). + +## Running end-to-end tests + +Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/). +Before running the tests make sure you are serving the app via `ng serve`. + +## Further help + +To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md). diff --git a/frontend/build.gradle b/frontend/build.gradle new file mode 100644 index 0000000..f45ff9d --- /dev/null +++ b/frontend/build.gradle @@ -0,0 +1,16 @@ +plugins { + id "com.moowork.node" version "1.1.1" +} + +node { + // Version of node to use. + version = '7.10.0' + + // Enabled the automatic download. + download = true +} + +// runs "gulp build" as part of your gradle build +task build { + dependsOn npm_run_build +} diff --git a/frontend/e2e/app.e2e-spec.ts b/frontend/e2e/app.e2e-spec.ts new file mode 100644 index 0000000..81e53a3 --- /dev/null +++ b/frontend/e2e/app.e2e-spec.ts @@ -0,0 +1,14 @@ +import { JabitServerPage } from './app.po'; + +describe('jabit-server App', () => { + let page: JabitServerPage; + + beforeEach(() => { + page = new JabitServerPage(); + }); + + it('should display message saying app works', () => { + page.navigateTo(); + expect(page.getParagraphText()).toEqual('app works!'); + }); +}); diff --git a/frontend/e2e/app.po.ts b/frontend/e2e/app.po.ts new file mode 100644 index 0000000..0c57700 --- /dev/null +++ b/frontend/e2e/app.po.ts @@ -0,0 +1,11 @@ +import { browser, by, element } from 'protractor'; + +export class JabitServerPage { + navigateTo() { + return browser.get('/'); + } + + getParagraphText() { + return element(by.css('app-root h1')).getText(); + } +} diff --git a/frontend/e2e/tsconfig.e2e.json b/frontend/e2e/tsconfig.e2e.json new file mode 100644 index 0000000..e2a9a2f --- /dev/null +++ b/frontend/e2e/tsconfig.e2e.json @@ -0,0 +1,12 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "outDir": "../out-tsc/e2e", + "module": "commonjs", + "target": "es5", + "types": [ + "jasmine", + "node" + ] + } +} diff --git a/frontend/karma.conf.js b/frontend/karma.conf.js new file mode 100644 index 0000000..84b4cd5 --- /dev/null +++ b/frontend/karma.conf.js @@ -0,0 +1,44 @@ +// Karma configuration file, see link for more information +// https://karma-runner.github.io/0.13/config/configuration-file.html + +module.exports = function (config) { + config.set({ + basePath: '', + frameworks: ['jasmine', '@angular/cli'], + plugins: [ + require('karma-jasmine'), + require('karma-chrome-launcher'), + require('karma-jasmine-html-reporter'), + require('karma-coverage-istanbul-reporter'), + require('@angular/cli/plugins/karma') + ], + client:{ + clearContext: false // leave Jasmine Spec Runner output visible in browser + }, + files: [ + { pattern: './src/test.ts', watched: false } + ], + preprocessors: { + './src/test.ts': ['@angular/cli'] + }, + mime: { + 'text/x-typescript': ['ts','tsx'] + }, + coverageIstanbulReporter: { + reports: [ 'html', 'lcovonly' ], + fixWebpackSourcePaths: true + }, + angularCli: { + environment: 'dev' + }, + reporters: config.angularCli && config.angularCli.codeCoverage + ? ['progress', 'coverage-istanbul'] + : ['progress', 'kjhtml'], + port: 9876, + colors: true, + logLevel: config.LOG_INFO, + autoWatch: true, + browsers: ['Chrome'], + singleRun: false + }); +}; diff --git a/frontend/package.json b/frontend/package.json new file mode 100644 index 0000000..2835169 --- /dev/null +++ b/frontend/package.json @@ -0,0 +1,53 @@ +{ + "name": "jabit-server", + "version": "0.0.0", + "license": "MIT", + "scripts": { + "ng": "ng", + "start": "ng serve", + "build": "ng build", + "test": "ng test", + "lint": "ng lint", + "e2e": "ng e2e" + }, + "private": true, + "dependencies": { + "@angular/animations": "^5.1.0", + "@angular/cdk": "^5.0.0", + "@angular/common": "^5.1.0", + "@angular/compiler": "^5.1.0", + "@angular/core": "^5.1.0", + "@angular/flex-layout": "^2.0.0-beta.10-4905443", + "@angular/forms": "^5.1.0", + "@angular/http": "^5.1.0", + "@angular/material": "^5.0.0", + "@angular/platform-browser": "^5.1.0", + "@angular/platform-browser-dynamic": "^5.1.0", + "@angular/router": "^5.1.0", + "ajv": "^5.5.1", + "codelyzer": "^4.0.1", + "core-js": "^2.4.1", + "rxjs": "^5.5.4", + "tslint": "^5.8.0", + "zone.js": "^0.8.4" + }, + "devDependencies": { + "@angular/cli": "^1.5.5", + "@angular/compiler-cli": "^5.1.0", + "@types/jasmine": "2.5.38", + "@types/node": "~6.0.60", + "codelyzer": "~2.0.0", + "jasmine-core": "~2.5.2", + "jasmine-spec-reporter": "~3.2.0", + "karma": "~1.4.1", + "karma-chrome-launcher": "~2.1.1", + "karma-cli": "~1.0.1", + "karma-coverage-istanbul-reporter": "^0.2.0", + "karma-jasmine": "~1.1.0", + "karma-jasmine-html-reporter": "^0.2.2", + "protractor": "~5.1.0", + "ts-node": "~2.0.0", + "tslint": "~4.5.0", + "typescript": "~2.5.0" + } +} diff --git a/frontend/protractor.conf.js b/frontend/protractor.conf.js new file mode 100644 index 0000000..1c5e1e5 --- /dev/null +++ b/frontend/protractor.conf.js @@ -0,0 +1,30 @@ +// Protractor configuration file, see link for more information +// https://github.com/angular/protractor/blob/master/lib/config.ts + +const { SpecReporter } = require('jasmine-spec-reporter'); + +exports.config = { + allScriptsTimeout: 11000, + specs: [ + './e2e/**/*.e2e-spec.ts' + ], + capabilities: { + 'browserName': 'chrome' + }, + directConnect: true, + baseUrl: 'http://localhost:4200/', + framework: 'jasmine', + jasmineNodeOpts: { + showColors: true, + defaultTimeoutInterval: 30000, + print: function() {} + }, + beforeLaunch: function() { + require('ts-node').register({ + project: 'e2e/tsconfig.e2e.json' + }); + }, + onPrepare() { + jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } })); + } +}; diff --git a/frontend/src/app/app.component.css b/frontend/src/app/app.component.css new file mode 100644 index 0000000..e69de29 diff --git a/frontend/src/app/app.component.html b/frontend/src/app/app.component.html new file mode 100644 index 0000000..14517cd --- /dev/null +++ b/frontend/src/app/app.component.html @@ -0,0 +1,10 @@ + +
+ {{title}} + + Status + +
+ + diff --git a/frontend/src/app/app.component.spec.ts b/frontend/src/app/app.component.spec.ts new file mode 100644 index 0000000..c740bcd --- /dev/null +++ b/frontend/src/app/app.component.spec.ts @@ -0,0 +1,32 @@ +import { TestBed, async } from '@angular/core/testing'; + +import { AppComponent } from './app.component'; + +describe('AppComponent', () => { + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ + AppComponent + ], + }).compileComponents(); + })); + + it('should create the app', async(() => { + const fixture = TestBed.createComponent(AppComponent); + const app = fixture.debugElement.componentInstance; + expect(app).toBeTruthy(); + })); + + it(`should have as title 'app works!'`, async(() => { + const fixture = TestBed.createComponent(AppComponent); + const app = fixture.debugElement.componentInstance; + expect(app.title).toEqual('app works!'); + })); + + it('should render title in a h1 tag', async(() => { + const fixture = TestBed.createComponent(AppComponent); + fixture.detectChanges(); + const compiled = fixture.debugElement.nativeElement; + expect(compiled.querySelector('h1').textContent).toContain('app works!'); + })); +}); diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts new file mode 100644 index 0000000..0151bba --- /dev/null +++ b/frontend/src/app/app.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-root', + templateUrl: './app.component.html', + styleUrls: ['./app.component.css'] +}) +export class AppComponent { + title = 'Jabit Bitmessage Server'; +} diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts new file mode 100644 index 0000000..043e95f --- /dev/null +++ b/frontend/src/app/app.module.ts @@ -0,0 +1,35 @@ +import {BrowserModule} from '@angular/platform-browser'; +import {NgModule} from '@angular/core'; + +import {AppComponent} from './app.component'; +import {MatButtonModule, MatCardModule, MatExpansionModule, MatToolbarModule} from '@angular/material'; +import {RouterModule} from "@angular/router"; +import {StatusComponent} from './status/status.component'; +import {APP_ROUTES} from "./app.routes"; +import {HttpClientModule} from "@angular/common/http"; +import { BroadcastComponent } from './broadcast/broadcast.component'; +import {BrowserAnimationsModule} from "@angular/platform-browser/animations"; +import {FlexLayoutModule} from "@angular/flex-layout"; + +@NgModule({ + declarations: [ + AppComponent, + StatusComponent, + BroadcastComponent + ], + imports: [ + BrowserModule, + BrowserAnimationsModule, + HttpClientModule, + RouterModule.forRoot(APP_ROUTES), + FlexLayoutModule, + MatToolbarModule, + MatCardModule, + MatExpansionModule, + MatButtonModule + ], + providers: [], + bootstrap: [AppComponent] +}) +export class AppModule { +} diff --git a/frontend/src/app/app.routes.ts b/frontend/src/app/app.routes.ts new file mode 100644 index 0000000..f0e0cde --- /dev/null +++ b/frontend/src/app/app.routes.ts @@ -0,0 +1,15 @@ +import {Route} from "@angular/router"; +import {StatusComponent} from "./status/status.component"; +import {BroadcastComponent} from "./broadcast/broadcast.component"; + +export const APP_ROUTES: Route[] = [ + { + path: 'status', + component: StatusComponent + }, + { + path: 'broadcasts/:address', + component: BroadcastComponent + }, + {path: '', redirectTo: 'status', pathMatch: 'full'} +]; diff --git a/frontend/src/app/broadcast/broadcast.component.html b/frontend/src/app/broadcast/broadcast.component.html new file mode 100644 index 0000000..5a017ff --- /dev/null +++ b/frontend/src/app/broadcast/broadcast.component.html @@ -0,0 +1,16 @@ +
+

{{broadcasts.sender.alias || broadcasts.sender.address}}

+ + + + {{message.subject}} + + + {{message.received * 1000 | date:'medium'}} + + + + 
{{message.body}}
+ + +
diff --git a/frontend/src/app/broadcast/broadcast.component.scss b/frontend/src/app/broadcast/broadcast.component.scss new file mode 100644 index 0000000..845b915 --- /dev/null +++ b/frontend/src/app/broadcast/broadcast.component.scss @@ -0,0 +1,4 @@ +:host { + margin: 2em; + display: block; +} diff --git a/frontend/src/app/broadcast/broadcast.component.spec.ts b/frontend/src/app/broadcast/broadcast.component.spec.ts new file mode 100644 index 0000000..f8f4a44 --- /dev/null +++ b/frontend/src/app/broadcast/broadcast.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { BroadcastComponent } from './broadcast.component'; + +describe('BroadcastComponent', () => { + let component: BroadcastComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ BroadcastComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(BroadcastComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/broadcast/broadcast.component.ts b/frontend/src/app/broadcast/broadcast.component.ts new file mode 100644 index 0000000..6061e26 --- /dev/null +++ b/frontend/src/app/broadcast/broadcast.component.ts @@ -0,0 +1,40 @@ +import {Component, OnInit} from '@angular/core'; +import {ActivatedRoute} from "@angular/router"; +import {HttpClient} from "@angular/common/http"; +import {Observable} from "rxjs/Observable"; + +@Component({ + selector: 'app-broadcast', + templateUrl: './broadcast.component.html', + styleUrls: ['./broadcast.component.scss'] +}) +export class BroadcastComponent implements OnInit { + + broadcasts$: Observable; + + constructor(private route: ActivatedRoute, private http: HttpClient) { + } + + ngOnInit() { + let address = this.route.snapshot.params['address']; + this.broadcasts$ = this.http.get('http://localhost:8080/read/' + address) + } + +} + +class Sender { + address: String; + alias: String; +} + +class Message { + id: any; + received: number; + subject: string; + body: string; +} + +class Broadcasts { + sender: Sender; + messages: Message[] +} diff --git a/frontend/src/app/status/status.component.html b/frontend/src/app/status/status.component.html new file mode 100644 index 0000000..3595779 --- /dev/null +++ b/frontend/src/app/status/status.component.html @@ -0,0 +1,3 @@ + + 
{{status}}
+ diff --git a/frontend/src/app/status/status.component.scss b/frontend/src/app/status/status.component.scss new file mode 100644 index 0000000..845b915 --- /dev/null +++ b/frontend/src/app/status/status.component.scss @@ -0,0 +1,4 @@ +:host { + margin: 2em; + display: block; +} diff --git a/frontend/src/app/status/status.component.spec.ts b/frontend/src/app/status/status.component.spec.ts new file mode 100644 index 0000000..ddf4f67 --- /dev/null +++ b/frontend/src/app/status/status.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { StatusComponent } from './status.component'; + +describe('StatusComponent', () => { + let component: StatusComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ StatusComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(StatusComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/status/status.component.ts b/frontend/src/app/status/status.component.ts new file mode 100644 index 0000000..2781b71 --- /dev/null +++ b/frontend/src/app/status/status.component.ts @@ -0,0 +1,22 @@ +import {Component, OnInit} from '@angular/core'; +import {HttpClient} from '@angular/common/http'; + +@Component({ + selector: 'app-status', + templateUrl: './status.component.html', + styleUrls: ['./status.component.scss'] +}) +export class StatusComponent implements OnInit { + + status: string; + + constructor(private http: HttpClient) { + } + + ngOnInit() { + this.http.get('http://localhost:8080/status').subscribe(data => { + this.status = JSON.stringify(data, null, 2); + }); + } + +} diff --git a/frontend/src/assets/.gitkeep b/frontend/src/assets/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/frontend/src/environments/environment.prod.ts b/frontend/src/environments/environment.prod.ts new file mode 100644 index 0000000..3612073 --- /dev/null +++ b/frontend/src/environments/environment.prod.ts @@ -0,0 +1,3 @@ +export const environment = { + production: true +}; diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts new file mode 100644 index 0000000..b7f639a --- /dev/null +++ b/frontend/src/environments/environment.ts @@ -0,0 +1,8 @@ +// The file contents for the current environment will overwrite these during build. +// The build system defaults to the dev environment which uses `environment.ts`, but if you do +// `ng build --env=prod` then `environment.prod.ts` will be used instead. +// The list of which env maps to which file can be found in `.angular-cli.json`. + +export const environment = { + production: false +}; diff --git a/frontend/src/favicon.ico b/frontend/src/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..8081c7ceaf2be08bf59010158c586170d9d2d517 GIT binary patch literal 5430 zcmc(je{54#6vvCoAI3i*G5%$U7!sA3wtMZ$fH6V9C`=eXGJb@R1%(I_{vnZtpD{6n z5Pl{DmxzBDbrB>}`90e12m8T*36WoeDLA&SD_hw{H^wM!cl_RWcVA!I+x87ee975; z@4kD^=bYPn&pmG@(+JZ`rqQEKxW<}RzhW}I!|ulN=fmjVi@x{p$cC`)5$a!)X&U+blKNvN5tg=uLvuLnuqRM;Yc*swiexsoh#XPNu{9F#c`G zQLe{yWA(Y6(;>y|-efAy11k<09(@Oo1B2@0`PtZSkqK&${ zgEY}`W@t{%?9u5rF?}Y7OL{338l*JY#P!%MVQY@oqnItpZ}?s z!r?*kwuR{A@jg2Chlf0^{q*>8n5Ir~YWf*wmsh7B5&EpHfd5@xVaj&gqsdui^spyL zB|kUoblGoO7G(MuKTfa9?pGH0@QP^b#!lM1yHWLh*2iq#`C1TdrnO-d#?Oh@XV2HK zKA{`eo{--^K&MW66Lgsktfvn#cCAc*(}qsfhrvOjMGLE?`dHVipu1J3Kgr%g?cNa8 z)pkmC8DGH~fG+dlrp(5^-QBeEvkOvv#q7MBVLtm2oD^$lJZx--_=K&Ttd=-krx(Bb zcEoKJda@S!%%@`P-##$>*u%T*mh+QjV@)Qa=Mk1?#zLk+M4tIt%}wagT{5J%!tXAE;r{@=bb%nNVxvI+C+$t?!VJ@0d@HIyMJTI{vEw0Ul ze(ha!e&qANbTL1ZneNl45t=#Ot??C0MHjjgY8%*mGisN|S6%g3;Hlx#fMNcL<87MW zZ>6moo1YD?P!fJ#Jb(4)_cc50X5n0KoDYfdPoL^iV`k&o{LPyaoqMqk92wVM#_O0l z09$(A-D+gVIlq4TA&{1T@BsUH`Bm=r#l$Z51J-U&F32+hfUP-iLo=jg7Xmy+WLq6_tWv&`wDlz#`&)Jp~iQf zZP)tu>}pIIJKuw+$&t}GQuqMd%Z>0?t%&BM&Wo^4P^Y z)c6h^f2R>X8*}q|bblAF?@;%?2>$y+cMQbN{X$)^R>vtNq_5AB|0N5U*d^T?X9{xQnJYeU{ zoZL#obI;~Pp95f1`%X3D$Mh*4^?O?IT~7HqlWguezmg?Ybq|7>qQ(@pPHbE9V?f|( z+0xo!#m@Np9PljsyxBY-UA*{U*la#8Wz2sO|48_-5t8%_!n?S$zlGe+NA%?vmxjS- zHE5O3ZarU=X}$7>;Okp(UWXJxI%G_J-@IH;%5#Rt$(WUX?6*Ux!IRd$dLP6+SmPn= z8zjm4jGjN772R{FGkXwcNv8GBcZI#@Y2m{RNF_w8(Z%^A*!bS*!}s6sh*NnURytky humW;*g7R+&|Ledvc- + + + + JabitServer + + + + + + + + + Loading... + + diff --git a/frontend/src/main.ts b/frontend/src/main.ts new file mode 100644 index 0000000..a9ca1ca --- /dev/null +++ b/frontend/src/main.ts @@ -0,0 +1,11 @@ +import { enableProdMode } from '@angular/core'; +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app/app.module'; +import { environment } from './environments/environment'; + +if (environment.production) { + enableProdMode(); +} + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/frontend/src/polyfills.ts b/frontend/src/polyfills.ts new file mode 100644 index 0000000..bc94e7a --- /dev/null +++ b/frontend/src/polyfills.ts @@ -0,0 +1,72 @@ +/** + * This file includes polyfills needed by Angular and is loaded before the app. + * You can add your own extra polyfills to this file. + * + * This file is divided into 2 sections: + * 1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers. + * 2. Application imports. Files imported after ZoneJS that should be loaded before your main + * file. + * + * The current setup is for so-called "evergreen" browsers; the last versions of browsers that + * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera), + * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile. + * + * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html + */ + +/*************************************************************************************************** + * BROWSER POLYFILLS + */ + +/** IE9, IE10 and IE11 requires all of the following polyfills. **/ +// import 'core-js/es6/symbol'; +// import 'core-js/es6/object'; +// import 'core-js/es6/function'; +// import 'core-js/es6/parse-int'; +// import 'core-js/es6/parse-float'; +// import 'core-js/es6/number'; +// import 'core-js/es6/math'; +// import 'core-js/es6/string'; +// import 'core-js/es6/date'; +// import 'core-js/es6/array'; +// import 'core-js/es6/regexp'; +// import 'core-js/es6/map'; +// import 'core-js/es6/set'; + +/** IE10 and IE11 requires the following for NgClass support on SVG elements */ +// import 'classlist.js'; // Run `npm install --save classlist.js`. + +/** IE10 and IE11 requires the following to support `@angular/animation`. */ +// import 'web-animations-js'; // Run `npm install --save web-animations-js`. + + +/** Evergreen browsers require these. **/ +import 'core-js/es6/reflect'; +import 'core-js/es7/reflect'; + + +/** ALL Firefox browsers require the following to support `@angular/animation`. **/ +// import 'web-animations-js'; // Run `npm install --save web-animations-js`. + + + +/*************************************************************************************************** + * Zone JS is required by Angular itself. + */ +import 'zone.js/dist/zone'; // Included with Angular CLI. + + + +/*************************************************************************************************** + * APPLICATION IMPORTS + */ + +/** + * Date, currency, decimal and percent pipes. + * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10 + */ +// import 'intl'; // Run `npm install --save intl`. +/** + * Need to import at least one locale-data with intl. + */ +// import 'intl/locale-data/jsonp/en'; diff --git a/frontend/src/styles.css b/frontend/src/styles.css new file mode 100644 index 0000000..7a81e04 --- /dev/null +++ b/frontend/src/styles.css @@ -0,0 +1,6 @@ +/* You can add global styles to this file, and also import other style files */ +@import "~@angular/material/prebuilt-themes/indigo-pink.css"; + +body { + margin: 0; +} diff --git a/frontend/src/test.ts b/frontend/src/test.ts new file mode 100644 index 0000000..9bf7226 --- /dev/null +++ b/frontend/src/test.ts @@ -0,0 +1,32 @@ +// This file is required by karma.conf.js and loads recursively all the .spec and framework files + +import 'zone.js/dist/long-stack-trace-zone'; +import 'zone.js/dist/proxy.js'; +import 'zone.js/dist/sync-test'; +import 'zone.js/dist/jasmine-patch'; +import 'zone.js/dist/async-test'; +import 'zone.js/dist/fake-async-test'; +import { getTestBed } from '@angular/core/testing'; +import { + BrowserDynamicTestingModule, + platformBrowserDynamicTesting +} from '@angular/platform-browser-dynamic/testing'; + +// Unfortunately there's no typing for the `__karma__` variable. Just declare it as any. +declare var __karma__: any; +declare var require: any; + +// Prevent Karma from running prematurely. +__karma__.loaded = function () {}; + +// First, initialize the Angular testing environment. +getTestBed().initTestEnvironment( + BrowserDynamicTestingModule, + platformBrowserDynamicTesting() +); +// Then we find all the tests. +const context = require.context('./', true, /\.spec\.ts$/); +// And load the modules. +context.keys().map(context); +// Finally, start Karma to run the tests. +__karma__.start(); diff --git a/frontend/src/tsconfig.app.json b/frontend/src/tsconfig.app.json new file mode 100644 index 0000000..5e2507d --- /dev/null +++ b/frontend/src/tsconfig.app.json @@ -0,0 +1,13 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "outDir": "../out-tsc/app", + "module": "es2015", + "baseUrl": "", + "types": [] + }, + "exclude": [ + "test.ts", + "**/*.spec.ts" + ] +} diff --git a/frontend/src/tsconfig.spec.json b/frontend/src/tsconfig.spec.json new file mode 100644 index 0000000..510e3f1 --- /dev/null +++ b/frontend/src/tsconfig.spec.json @@ -0,0 +1,20 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "outDir": "../out-tsc/spec", + "module": "commonjs", + "target": "es5", + "baseUrl": "", + "types": [ + "jasmine", + "node" + ] + }, + "files": [ + "test.ts" + ], + "include": [ + "**/*.spec.ts", + "**/*.d.ts" + ] +} diff --git a/frontend/src/typings.d.ts b/frontend/src/typings.d.ts new file mode 100644 index 0000000..ef5c7bd --- /dev/null +++ b/frontend/src/typings.d.ts @@ -0,0 +1,5 @@ +/* SystemJS module definition */ +declare var module: NodeModule; +interface NodeModule { + id: string; +} diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json new file mode 100644 index 0000000..a35a8ee --- /dev/null +++ b/frontend/tsconfig.json @@ -0,0 +1,20 @@ +{ + "compileOnSave": false, + "compilerOptions": { + "outDir": "./dist/out-tsc", + "baseUrl": "src", + "sourceMap": true, + "declaration": false, + "moduleResolution": "node", + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "target": "es5", + "typeRoots": [ + "node_modules/@types" + ], + "lib": [ + "es2016", + "dom" + ] + } +} diff --git a/frontend/tslint.json b/frontend/tslint.json new file mode 100644 index 0000000..97adaa5 --- /dev/null +++ b/frontend/tslint.json @@ -0,0 +1,130 @@ +{ + "rulesDirectory": [ + "node_modules/codelyzer" + ], + "rules": { + "callable-types": true, + "class-name": true, + "comment-format": [ + true, + "check-space" + ], + "curly": true, + "eofline": true, + "forin": true, + "import-blacklist": [ + true, + "rxjs" + ], + "import-spacing": true, + "indent": [ + true, + "spaces" + ], + "interface-over-type-literal": true, + "label-position": true, + "max-line-length": [ + true, + 140 + ], + "member-access": false, + "member-ordering": [ + true, + "static-before-instance", + "variables-before-functions" + ], + "no-arg": true, + "no-bitwise": true, + "no-console": [ + true, + "debug", + "info", + "time", + "timeEnd", + "trace" + ], + "no-construct": true, + "no-debugger": true, + "no-empty": false, + "no-empty-interface": true, + "no-eval": true, + "no-inferrable-types": [ + true, + "ignore-params" + ], + "no-shadowed-variable": true, + "no-string-literal": false, + "no-string-throw": true, + "no-switch-case-fall-through": true, + "no-trailing-whitespace": true, + "no-unused-expression": true, + "no-use-before-declare": true, + "no-var-keyword": true, + "object-literal-sort-keys": false, + "one-line": [ + true, + "check-open-brace", + "check-catch", + "check-else", + "check-whitespace" + ], + "prefer-const": true, + "quotemark": [ + true, + "single" + ], + "radix": true, + "semicolon": [ + "always" + ], + "triple-equals": [ + true, + "allow-null-check" + ], + "typedef-whitespace": [ + true, + { + "call-signature": "nospace", + "index-signature": "nospace", + "parameter": "nospace", + "property-declaration": "nospace", + "variable-declaration": "nospace" + } + ], + "typeof-compare": true, + "unified-signatures": true, + "variable-name": false, + "whitespace": [ + true, + "check-branch", + "check-decl", + "check-operator", + "check-separator", + "check-type" + ], + "directive-selector": [ + true, + "attribute", + "app", + "camelCase" + ], + "component-selector": [ + true, + "element", + "app", + "kebab-case" + ], + "use-input-property-decorator": true, + "use-output-property-decorator": true, + "use-host-property-decorator": true, + "no-input-rename": true, + "no-output-rename": true, + "use-life-cycle-interface": true, + "use-pipe-transform-interface": true, + "component-class-suffix": true, + "directive-class-suffix": true, + "no-access-missing-member": true, + "templates-use-public": true, + "invoke-injectable": true + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 3d0dee6e8edfecc92e04653ec780de06f7b34f8b..05ef575b0cd0173fc735f2857ce4bd594ce4f6bd 100644 GIT binary patch delta 27739 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 +cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME="`pwd -P`" -cd "$SAVED" >&- +cd "$SAVED" >/dev/null CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -114,6 +109,7 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` diff --git a/settings.gradle b/settings.gradle index b13e282..5557193 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,3 @@ -include 'webapp' \ No newline at end of file +include 'frontend' + +rootProject.name = 'jabit-server' \ No newline at end of file diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile new file mode 100644 index 0000000..fb58667 --- /dev/null +++ b/src/main/docker/Dockerfile @@ -0,0 +1,6 @@ +FROM frolvlad/alpine-oraclejdk8:slim +VOLUME /tmp +ADD jabit-server.jar app.jar +RUN sh -c 'touch /app.jar' +ENV JAVA_OPTS="" +ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app.jar" ] diff --git a/src/main/java/ch/dissem/bitmessage/server/Constants.java b/src/main/java/ch/dissem/bitmessage/server/Constants.java deleted file mode 100644 index a25f019..0000000 --- a/src/main/java/ch/dissem/bitmessage/server/Constants.java +++ /dev/null @@ -1,13 +0,0 @@ -package ch.dissem.bitmessage.server; - -/** - * Created by chrigu on 22.11.15. - */ -public interface Constants { - String ADMIN_LIST = "admins.conf"; - String CLIENT_LIST = "clients.conf"; - - String WHITELIST = "whitelist.conf"; - String SHORTLIST = "shortlist.conf"; - String BLACKLIST = "blacklist.conf"; -} diff --git a/src/main/java/ch/dissem/bitmessage/server/Converter.java b/src/main/java/ch/dissem/bitmessage/server/Converter.java deleted file mode 100644 index 364831a..0000000 --- a/src/main/java/ch/dissem/bitmessage/server/Converter.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2015 Christian Basler - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package ch.dissem.bitmessage.server; - -import ch.dissem.bitmessage.entity.BitmessageAddress; -import ch.dissem.bitmessage.entity.Plaintext; -import ch.dissem.bitmessage.server.entities.Broadcasts; -import ch.dissem.bitmessage.server.entities.Message; -import ch.dissem.bitmessage.server.entities.Sender; -import ch.dissem.bitmessage.utils.UnixTime; - -import java.util.Collection; - -public class Converter { - public static Broadcasts broadcasts(BitmessageAddress sender, Collection messages) { - Broadcasts result = new Broadcasts(); - result.sender = sender(sender); - result.messages = new Message[messages.size()]; - int i = 0; - for (Plaintext msg : messages) { - result.messages[i] = message(msg); - i++; - } - return result; - } - - public static Broadcasts broadcasts(BitmessageAddress sender, Message... messages) { - Broadcasts result = new Broadcasts(); - result.sender = sender(sender); - result.messages = messages; - return result; - } - - public static Sender sender(BitmessageAddress sender) { - Sender result = new Sender(); - result.address = sender.getAddress(); - result.alias = sender.toString(); - return result; - } - - public static Message message(String subject, String body) { - Message result = new Message(); - result.id = 0; - result.received = UnixTime.now(); - result.subject = subject; - result.body = body; - return result; - } - - public static Message message(Plaintext plaintext) { - Message result = new Message(); - result.id = plaintext.getId(); - result.received = plaintext.getReceived(); - result.subject = plaintext.getSubject(); - result.body = plaintext.getText(); - return result; - } -} diff --git a/src/main/java/ch/dissem/bitmessage/server/JabitServerConfig.java b/src/main/java/ch/dissem/bitmessage/server/JabitServerConfig.java deleted file mode 100644 index 6c7c52a..0000000 --- a/src/main/java/ch/dissem/bitmessage/server/JabitServerConfig.java +++ /dev/null @@ -1,210 +0,0 @@ -/* - * Copyright 2015 Christian Basler - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package ch.dissem.bitmessage.server; - -import ch.dissem.bitmessage.BitmessageContext; -import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography; -import ch.dissem.bitmessage.entity.BitmessageAddress; -import ch.dissem.bitmessage.entity.payload.Pubkey; -import ch.dissem.bitmessage.networking.nio.NioNetworkHandler; -import ch.dissem.bitmessage.ports.*; -import ch.dissem.bitmessage.repository.*; -import ch.dissem.bitmessage.server.repository.ServerProofOfWorkRepository; -import ch.dissem.bitmessage.utils.Singleton; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; - -import java.util.List; -import java.util.Set; - -import static ch.dissem.bitmessage.server.Constants.*; -import static java.util.stream.Collectors.toSet; - -@Configuration -public class JabitServerConfig { - private static final Logger LOG = LoggerFactory.getLogger(JabitServerConfig.class); - - public static final int SHORTLIST_SIZE = 5; - - @Value("${bitmessage.port}") - private int port; - @Value("${bitmessage.connection.ttl.hours}") - private int connectionTTL; - @Value("${bitmessage.connection.limit}") - private int connectionLimit; - - @Value("${database.url}") - private String dbUrl; - @Value("${database.user}") - private String dbUser; - @Value("${database.password}") - private String dbPassword; - - @Bean - public JdbcConfig jdbcConfig() { - return new JdbcConfig(dbUrl, dbUser, dbPassword); - } - - @Bean - public AddressRepository addressRepo() { - return new JdbcAddressRepository(jdbcConfig()); - } - - @Bean - public Inventory inventory() { - return new JdbcInventory(jdbcConfig()); - } - - @Bean - public MessageRepository messageRepo() { - return new JdbcMessageRepository(jdbcConfig()); - } - - @Bean - public ProofOfWorkRepository proofOfWorkRepo() { - return new JdbcProofOfWorkRepository(jdbcConfig()); - } - - @Bean - public NodeRegistry nodeRegistry() { - return new JdbcNodeRegistry(jdbcConfig()); - } - - @Bean - public NetworkHandler networkHandler() { - return new NioNetworkHandler(); - } - - @Bean - public Cryptography cryptography() { - Cryptography cryptography = new BouncyCryptography(); - Singleton.initialize(cryptography); // needed for admins and clients - return cryptography; - } - - @Bean - public BitmessageContext.Listener serverListener() { - return new ServerListener(admins(), clients(), whitelist(), shortlist(), blacklist()); - } - - @Bean - public ServerProofOfWorkRepository serverProofOfWorkRepository() { - return new ServerProofOfWorkRepository(jdbcConfig()); - } - - @Bean - public CustomCommandHandler commandHandler() { - return new ProofOfWorkRequestHandler(serverProofOfWorkRepository(), clients()); - } - - @Bean - public BitmessageContext bitmessageContext() { - return new BitmessageContext.Builder() - .addressRepo(addressRepo()) - .inventory(inventory()) - .messageRepo(messageRepo()) - .nodeRegistry(nodeRegistry()) - .powRepo(proofOfWorkRepo()) - .networkHandler(networkHandler()) - .listener(serverListener()) - .customCommandHandler(commandHandler()) - .cryptography(cryptography()) - .port(port) - .connectionLimit(connectionLimit) - .connectionTTL(connectionTTL) - .build(); - } - - @Bean - public Set<BitmessageAddress> admins() { - cryptography(); - return Utils.readOrCreateList( - ADMIN_LIST, - "# Admins can send commands to the server.\n" - ).stream().map(BitmessageAddress::new).collect(toSet()); - } - - @Bean - public Set<BitmessageAddress> clients() { - cryptography(); - return Utils.readOrCreateList( - CLIENT_LIST, - "# Clients may send incomplete objects for proof of work.\n" - ).stream().map(BitmessageAddress::new).collect(toSet()); - } - - @Bean - public Set<String> whitelist() { - return Utils.readOrCreateList( - WHITELIST, - "# If there are any Bitmessage addresses in the whitelist, only those will be shown.\n" + - "# blacklist.conf will be ignored, but shortlist.conf will be applied to whitelisted addresses.\n" - ); - } - - @Bean - public Set<String> shortlist() { - return Utils.readOrCreateList( - SHORTLIST, - "# Broadcasts of these addresses will be restricted to the last " + SHORTLIST_SIZE + " entries.\n\n" + - "# Time Service:\n" + - "BM-BcbRqcFFSQUUmXFKsPJgVQPSiFA3Xash\n\n" + - "# Q's Aktivlist:\n" + - "BM-GtT7NLCCAu3HrT7dNTUTY9iDns92Z2ND\n" - ); - } - - @Bean - public Set<String> blacklist() { - return Utils.readOrCreateList( - BLACKLIST, - "# Bitmessage addresses in this file are being ignored and their broadcasts won't be returned.\n" - ); - } - - @Bean - public Docket api() { - return new Docket(DocumentationType.SWAGGER_2) - .select() - .build(); - } - - @Bean - public BitmessageAddress identity() { - List<BitmessageAddress> identities = bitmessageContext().addresses().getIdentities(); - BitmessageAddress identity; - if (identities.isEmpty()) { - LOG.info("Creating new identity..."); - identity = bitmessageContext().createIdentity(false, Pubkey.Feature.DOES_ACK); - LOG.info("Identity " + identity.getAddress() + " created."); - } else { - LOG.info("Identities:"); - identities.stream().map(BitmessageAddress::getAddress).forEach(LOG::info); - identity = identities.get(0); - if (identities.size() > 1) { - LOG.info("Using " + identity); - } - } - LOG.info("QR Code:\n" + Utils.qrCode(identity)); - return identity; - } -} diff --git a/src/main/java/ch/dissem/bitmessage/server/JabitServerController.java b/src/main/java/ch/dissem/bitmessage/server/JabitServerController.java deleted file mode 100644 index 3812cc4..0000000 --- a/src/main/java/ch/dissem/bitmessage/server/JabitServerController.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright 2015 Christian Basler - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package ch.dissem.bitmessage.server; - -import ch.dissem.bitmessage.BitmessageContext; -import ch.dissem.bitmessage.entity.BitmessageAddress; -import ch.dissem.bitmessage.entity.Plaintext; -import ch.dissem.bitmessage.server.entities.Broadcasts; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.PostConstruct; -import javax.annotation.Resource; -import javax.inject.Inject; -import java.util.List; -import java.util.Set; - -import static ch.dissem.bitmessage.server.Converter.broadcasts; -import static ch.dissem.bitmessage.server.Converter.message; -import static org.springframework.web.bind.annotation.RequestMethod.GET; - -/** - * @author Christian Basler - */ -@CrossOrigin -@RestController -public class JabitServerController { - private static final Logger LOG = LoggerFactory.getLogger(JabitServerController.class); - - private static final long HOUR = 60 * 60 * 1000l; // in ms - - private static final String CONFIG_FILE = "config.properties"; - private static final String PROPERTY_PORT = "port"; - - private static final int SHORTLIST_SIZE = 5; - - @Resource - private Set<String> whitelist; - @Resource - private Set<String> shortlist; - @Resource - private Set<String> blacklist; - @Inject - private BitmessageAddress identity; - @Inject - private BitmessageContext ctx; - - @RequestMapping(value = "status", method = GET, produces = "application/json") - public String status() { - return ctx.status().toString(); - } - - @RequestMapping(value = "read/{broadcastAddress}", method = GET) - public Broadcasts read(@PathVariable String broadcastAddress) { - if ("test".equalsIgnoreCase(broadcastAddress)) { - return broadcasts( - new BitmessageAddress("BM-2cWhyaPxydemCeM8dWJUBmEo8iu7v2JptK"), - message("Test", "This is a test message. The rest service is running."), - message("Another Test", "And because it's such fun, a second message.") - ); - } - - BitmessageAddress broadcaster = ctx.addresses().getAddress(broadcastAddress); - if (broadcaster == null) { - broadcaster = new BitmessageAddress(broadcastAddress); - } - - if (!whitelist.isEmpty() && !whitelist.contains(broadcaster.getAddress())) { - return broadcasts(broadcaster, message("Not Whitelisted", "Messages for " + broadcaster + - " can't be shown, as the sender isn't on the whitelist.")); - } - if (blacklist.contains(broadcaster.getAddress())) { - return broadcasts(broadcaster, message("Blacklisted", "Unfortunately, " + broadcaster + - " is on the blacklist, so it's messages can't be shown.")); - } - - if (!broadcaster.isSubscribed()) { - ctx.addSubscribtion(broadcaster); - } - List<Plaintext> messages = ctx.messages().findMessages(broadcaster); - if (shortlist.contains(broadcaster.getAddress())) { - while (messages.size() > SHORTLIST_SIZE) { - ctx.messages().remove(messages.get(messages.size() - 1)); - messages.remove(messages.size() - 1); - } - } - return broadcasts(broadcaster, messages); - } - - @Scheduled(cron = "0 0 0 * * *") - public void broadcastStatus() { - ctx.broadcast(identity, "Status", ctx.status().toString()); - } - - @Scheduled(cron = "0 0 2 * * *") - public void cleanup() { - ctx.cleanup(); - } - - @PostConstruct - public void setUp() { - ctx.startup(); - } -} diff --git a/src/main/java/ch/dissem/bitmessage/server/ProofOfWorkRequestHandler.java b/src/main/java/ch/dissem/bitmessage/server/ProofOfWorkRequestHandler.java deleted file mode 100644 index 79ff004..0000000 --- a/src/main/java/ch/dissem/bitmessage/server/ProofOfWorkRequestHandler.java +++ /dev/null @@ -1,155 +0,0 @@ -/* - * Copyright 2015 Christian Basler - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package ch.dissem.bitmessage.server; - -import ch.dissem.bitmessage.InternalContext; -import ch.dissem.bitmessage.entity.BitmessageAddress; -import ch.dissem.bitmessage.entity.CustomMessage; -import ch.dissem.bitmessage.entity.MessagePayload; -import ch.dissem.bitmessage.entity.valueobject.PrivateKey; -import ch.dissem.bitmessage.exception.DecryptionFailedException; -import ch.dissem.bitmessage.extensions.CryptoCustomMessage; -import ch.dissem.bitmessage.extensions.pow.ProofOfWorkRequest; -import ch.dissem.bitmessage.ports.CustomCommandHandler; -import ch.dissem.bitmessage.ports.ProofOfWorkEngine; -import ch.dissem.bitmessage.server.repository.ServerProofOfWorkRepository; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Collection; -import java.util.List; -import java.util.Timer; -import java.util.TimerTask; -import java.util.stream.Collectors; - -import static ch.dissem.bitmessage.extensions.pow.ProofOfWorkRequest.Request.CALCULATING; -import static ch.dissem.bitmessage.extensions.pow.ProofOfWorkRequest.Request.COMPLETE; -import static ch.dissem.bitmessage.utils.UnixTime.DAY; - -/** - * @author Christian Basler - */ -public class ProofOfWorkRequestHandler implements CustomCommandHandler, InternalContext.ContextHolder { - private final static Logger LOG = LoggerFactory.getLogger(ProofOfWorkRequestHandler.class); - - private final List<byte[]> decryptionKeys; - private final ServerProofOfWorkRepository repo; - private BitmessageAddress serverIdentity; - private ProofOfWorkEngine engine; - private InternalContext context; - - public ProofOfWorkRequestHandler(ServerProofOfWorkRepository repo, Collection<BitmessageAddress> clients) { - this.repo = repo; - decryptionKeys = clients.stream().map(BitmessageAddress::getPublicDecryptionKey).collect(Collectors.toList()); - new Timer().schedule(new TimerTask() { - @Override - public void run() { - doMissingProofOfWork(); - } - }, 15_000); // After 15 seconds - new Timer().schedule(new TimerTask() { - @Override - public void run() { - repo.cleanupTasks(7 * DAY); - } - }, 60_000, DAY * 1000); // First time after 1 minute, then daily - } - - public void doMissingProofOfWork() { - List<ServerProofOfWorkRepository.Task> incompleteTasks = repo.getIncompleteTasks(); - LOG.info("Doing POW for " + incompleteTasks.size() + " tasks."); - for (ServerProofOfWorkRepository.Task task : incompleteTasks) { - engine.calculateNonce(task.initialHash, task.target, repo::updateTask); - } - } - - @Override - public MessagePayload handle(CustomMessage message) { - CryptoCustomMessage<ProofOfWorkRequest> cryptoMessage = CryptoCustomMessage.read(message, - ProofOfWorkRequest::read); - ProofOfWorkRequest request = decrypt(cryptoMessage); - if (request == null) { - return CustomMessage.error( - "Unknown sender. Please ask the server's administrator to add you as a client. " + - "For this he'll need your identity." - ); - } - switch (request.getRequest()) { - case CALCULATE: - if (!repo.hasTask(request.getInitialHash())) { - repo.storeTask(request); - // TODO: This is probably the place to do some book-keeping - // if we want to bill our customers. - engine.calculateNonce(request.getInitialHash(), request.getData(), repo::updateTask); - return new CryptoCustomMessage<>( - new ProofOfWorkRequest(getIdentity(), request.getInitialHash(), CALCULATING, new byte[0]) - ); - } else { - byte[] nonce = repo.getNonce(request); - CryptoCustomMessage<ProofOfWorkRequest> response; - if (nonce != null) { - response = new CryptoCustomMessage<>( - new ProofOfWorkRequest(getIdentity(), request.getInitialHash(), COMPLETE, nonce) - ); - } else { - response = new CryptoCustomMessage<>( - new ProofOfWorkRequest(getIdentity(), request.getInitialHash(), CALCULATING, new byte[0]) - ); - } - response.signAndEncrypt(serverIdentity, request.getSender().getPubkey().getEncryptionKey()); - return response; - } - } - return null; - } - - private BitmessageAddress getIdentity() { - if (serverIdentity == null) { - synchronized (this) { - if (serverIdentity == null) { - serverIdentity = context.getAddressRepository().getIdentities().stream().findFirst().orElseGet(() -> { - final BitmessageAddress identity = new BitmessageAddress(new PrivateKey( - false, - context.getStreams()[0], - InternalContext.NETWORK_NONCE_TRIALS_PER_BYTE, - InternalContext.NETWORK_EXTRA_BYTES - )); - context.getAddressRepository().save(identity); - return identity; - }); - } - } - } - return serverIdentity; - } - - private ProofOfWorkRequest decrypt(CryptoCustomMessage<ProofOfWorkRequest> cryptoMessage) { - for (byte[] key : decryptionKeys) { - try { - return cryptoMessage.decrypt(key); - } catch (DecryptionFailedException ignore) { - } - } - return null; - } - - @Override - public void setContext(InternalContext context) { - this.context = context; - this.engine = context.getProofOfWorkEngine(); - } -} diff --git a/src/main/java/ch/dissem/bitmessage/server/ServerListener.java b/src/main/java/ch/dissem/bitmessage/server/ServerListener.java deleted file mode 100644 index 4959965..0000000 --- a/src/main/java/ch/dissem/bitmessage/server/ServerListener.java +++ /dev/null @@ -1,181 +0,0 @@ -/* - * Copyright 2015 Christian Basler - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package ch.dissem.bitmessage.server; - -import ch.dissem.bitmessage.BitmessageContext; -import ch.dissem.bitmessage.entity.BitmessageAddress; -import ch.dissem.bitmessage.entity.Plaintext; -import ch.dissem.bitmessage.entity.valueobject.extended.Message; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Collection; -import java.util.List; -import java.util.Scanner; - -import static ch.dissem.bitmessage.entity.Plaintext.Encoding.EXTENDED; -import static ch.dissem.bitmessage.entity.Plaintext.Type.MSG; -import static ch.dissem.bitmessage.server.Constants.*; - -/** - * @author Christian Basler - */ -public class ServerListener implements BitmessageContext.Listener.WithContext { - private final static Logger LOG = LoggerFactory.getLogger(ServerListener.class); - - private final Collection<BitmessageAddress> admins; - private final Collection<BitmessageAddress> clients; - - private final Collection<String> whitelist; - private final Collection<String> shortlist; - private final Collection<String> blacklist; - - private BitmessageContext ctx; - private BitmessageAddress identity; - - public ServerListener(Collection<BitmessageAddress> admins, - Collection<BitmessageAddress> clients, - Collection<String> whitelist, - Collection<String> shortlist, - Collection<String> blacklist) { - this.admins = admins; - this.clients = clients; - this.whitelist = whitelist; - this.shortlist = shortlist; - this.blacklist = blacklist; - } - - @Override - public void setContext(BitmessageContext ctx) { - this.ctx = ctx; - } - - private BitmessageAddress getIdentity() { - if (identity == null) { - List<BitmessageAddress> identities = ctx.addresses().getIdentities(); - if (!identities.isEmpty()) { - identity = identities.get(0); - } - } - return identity; - } - - @Override - public void receive(Plaintext message) { - if (admins.contains(message.getFrom())) { - String[] command = message.getSubject().trim().toLowerCase().split("\\s+"); - String data = message.getText(); - if (command.length == 1) { - switch (command[0].toLowerCase()) { - case "status": - Plaintext.Builder response = new Plaintext.Builder(MSG); - response.from(getIdentity()); - response.to(message.getFrom()); - if (message.getEncoding() == EXTENDED) { - response.message( - new Message.Builder() - .subject("RE: status") - .body(ctx.status().toString()) - .addParent(message) - .build() - ); - } else { - response.message("RE: status", ctx.status().toString()); - } - ctx.send(response.build()); - break; - default: - LOG.info("ignoring unknown command " + message.getSubject()); - } - } else if (command.length == 2) { - switch (command[1].toLowerCase()) { - case "client": - case "clients": - updateUserList(CLIENT_LIST, clients, command[0], data); - break; - case "admin": - case "admins": - case "administrator": - case "administrators": - updateUserList(ADMIN_LIST, admins, command[0], data); - break; - case "whitelist": - updateList(WHITELIST, whitelist, command[0], data); - break; - case "shortlist": - updateList(SHORTLIST, shortlist, command[0], data); - break; - case "blacklist": - updateList(BLACKLIST, blacklist, command[0], data); - break; - default: - LOG.info("ignoring unknown command " + message.getSubject()); - } - } - } - } - - private void updateUserList(String file, Collection<BitmessageAddress> list, String command, String data) { - switch (command.toLowerCase()) { - case "set": - list.clear(); - case "add": - Scanner scanner = new Scanner(data); - while (scanner.hasNextLine()) { - String line = scanner.nextLine(); - try { - list.add(new BitmessageAddress(line)); - } catch (Exception e) { - LOG.info(command + " " + file + ": ignoring line: " + line); - } - } - Utils.saveList(file, list.stream().map(BitmessageAddress::getAddress)); - break; - case "remove": - list.removeIf(address -> data.contains(address.getAddress())); - Utils.saveList(file, list.stream().map(BitmessageAddress::getAddress)); - break; - default: - LOG.info("unknown command " + command + " on list " + file); - } - } - - private void updateList(String file, Collection<String> list, String command, String data) { - switch (command.toLowerCase()) { - case "set": - list.clear(); - case "add": - Scanner scanner = new Scanner(data); - while (scanner.hasNextLine()) { - String line = scanner.nextLine(); - try { - list.add(new BitmessageAddress(line).getAddress()); - } catch (Exception e) { - LOG.info(command + " " + file + ": ignoring line: " + line); - } - } - Utils.saveList(file, list.stream()); - break; - case "remove": - list.removeIf(data::contains); - Utils.saveList(file, list.stream()); - break; - default: - LOG.info("unknown command " + command + " on list " + file); - } - } -} diff --git a/src/main/java/ch/dissem/bitmessage/server/Utils.java b/src/main/java/ch/dissem/bitmessage/server/Utils.java deleted file mode 100644 index 8b9e0cd..0000000 --- a/src/main/java/ch/dissem/bitmessage/server/Utils.java +++ /dev/null @@ -1,153 +0,0 @@ -/* - * Copyright 2015 Christian Basler - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package ch.dissem.bitmessage.server; - -import ch.dissem.bitmessage.entity.BitmessageAddress; -import com.google.zxing.WriterException; -import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; -import com.google.zxing.qrcode.encoder.ByteMatrix; -import com.google.zxing.qrcode.encoder.Encoder; -import com.google.zxing.qrcode.encoder.QRCode; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileWriter; -import java.io.IOException; -import java.util.HashSet; -import java.util.Scanner; -import java.util.Set; -import java.util.stream.Stream; - -public class Utils { - private static final Logger LOG = LoggerFactory.getLogger(Utils.class); - - public static Set<String> readOrCreateList(String filename, String content) { - try { - File file = new File(filename); - if (!file.exists()) { - if (file.createNewFile()) { - try (FileWriter fw = new FileWriter(file)) { - fw.write(content); - } - } - } - return readList(file); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - public static void saveList(String filename, Stream<String> content) { - try { - File file = new File(filename); - try (FileWriter fw = new FileWriter(file)) { - content.forEach(l -> { - try { - fw.write(l); - fw.write(System.lineSeparator()); - } catch (IOException e) { - throw new RuntimeException(e); - } - }); - } - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - public static Set<String> readList(File file) { - Set<String> result = new HashSet<>(); - try { - Scanner scanner = new Scanner(file); - while (scanner.hasNextLine()) { - String line = scanner.nextLine().trim(); - if (line.startsWith("BM-")) { - result.add(line); - } - } - } catch (FileNotFoundException e) { - e.printStackTrace(); - } - return result; - } - - public static String qrCode(BitmessageAddress address) { - StringBuilder link = new StringBuilder(); - link.append("bitmessage:"); - link.append(address.getAddress()); - if (address.getAlias() != null) { - link.append("?label=").append(address.getAlias()); - } - // This makes the QR code quite big, so it's not active. But sometimes it might be useful: -// if (address.getPubkey() != null) { -// link.append(address.getAlias() == null ? '?' : '&'); -// ByteArrayOutputStream pubkey = new ByteArrayOutputStream(); -// address.getPubkey().writeUnencrypted(pubkey); -// link.append("pubkey=").append(Base64.getUrlEncoder().encodeToString(pubkey.toByteArray())); -// } - QRCode code; - try { - code = Encoder.encode(link.toString(), ErrorCorrectionLevel.L, null); - } catch (WriterException e) { - LOG.error(e.getMessage(), e); - return ""; - } - ByteMatrix matrix = code.getMatrix(); - StringBuilder result = new StringBuilder(); - for (int i = 0; i < 2; i++) { - for (int j = 0; j < matrix.getWidth() + 8; j++) { - result.append('█'); - } - result.append('\n'); - } - for (int i = 0; i < matrix.getHeight(); i += 2) { - result.append("████"); - for (int j = 0; j < matrix.getWidth(); j++) { - if (matrix.get(i, j) > 0) { - if (matrix.getHeight() > i + 1 && matrix.get(i + 1, j) > 0) { - result.append(' '); - } else { - result.append('▄'); - } - } else { - if (matrix.getHeight() > i + 1 && matrix.get(i + 1, j) > 0) { - result.append('▀'); - } else { - result.append('█'); - } - } - } - result.append("████\n"); - } - for (int i = 0; i < 2; i++) { - for (int j = 0; j < matrix.getWidth() + 8; j++) { - result.append('█'); - } - result.append('\n'); - } - return result.toString(); - } - - public static boolean zero(byte[] nonce) { - for (byte b : nonce) { - if (b != 0) return false; - } - return true; - } -} diff --git a/src/main/java/ch/dissem/bitmessage/server/repository/ServerProofOfWorkRepository.java b/src/main/java/ch/dissem/bitmessage/server/repository/ServerProofOfWorkRepository.java deleted file mode 100644 index 5e1c3f7..0000000 --- a/src/main/java/ch/dissem/bitmessage/server/repository/ServerProofOfWorkRepository.java +++ /dev/null @@ -1,137 +0,0 @@ -/* - * Copyright 2015 Christian Basler - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package ch.dissem.bitmessage.server.repository; - -import ch.dissem.bitmessage.extensions.pow.ProofOfWorkRequest; -import ch.dissem.bitmessage.repository.JdbcConfig; -import ch.dissem.bitmessage.repository.JdbcHelper; -import ch.dissem.bitmessage.utils.UnixTime; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.LinkedList; -import java.util.List; - -/** - * @author Christian Basler - */ -public class ServerProofOfWorkRepository extends JdbcHelper { - - public ServerProofOfWorkRepository(JdbcConfig config) { - super(config); - } - - /** - * client (can be removed once the new IV is returned) - * IV (without nonce) - * IV (with nonce, can be removed once the new IV is returned) - * status: calculating, finished, confirmed - * data (can be removed once POW calculation is done) - */ - public void storeTask(ProofOfWorkRequest request) { - try (Connection connection = config.getConnection()) { - PreparedStatement ps = connection.prepareStatement( - "INSERT INTO ProofOfWorkTask (initial_hash, client, target, timestamp) VALUES (?, ?, ?, ?)"); - ps.setBytes(1, request.getInitialHash()); - ps.setString(2, request.getSender().getAddress()); - ps.setBytes(3, request.getData()); - ps.setLong(4, UnixTime.now()); - ps.executeUpdate(); - } catch (SQLException e) { - throw new RuntimeException(e); - } - } - - public void updateTask(byte[] initalHash, byte[] nonce) { - try (Connection connection = config.getConnection()) { - PreparedStatement ps = connection.prepareStatement( - "UPDATE ProofOfWorkTask SET nonce = ? WHERE initial_hash = ?"); - ps.setBytes(1, nonce); - ps.setBytes(2, initalHash); - ps.executeUpdate(); - } catch (SQLException e) { - throw new RuntimeException(e); - } - } - - public byte[] getNonce(ProofOfWorkRequest request) { - try (Connection connection = config.getConnection()) { - PreparedStatement ps = connection.prepareStatement("SELECT nonce FROM ProofOfWorkTask WHERE initial_hash = ?"); - ps.setBytes(1, request.getInitialHash()); - ResultSet rs = ps.executeQuery(); - if (rs.next()) { - return rs.getBytes(1); - } else { - return null; - } - } catch (SQLException e) { - throw new RuntimeException(e); - } - } - - public boolean hasTask(byte[] initialHash) { - try (Connection connection = config.getConnection()) { - PreparedStatement ps = connection.prepareStatement("SELECT count(1) FROM ProofOfWorkTask WHERE initial_hash = ?"); - ps.setBytes(1, initialHash); - ResultSet rs = ps.executeQuery(); - rs.next(); - return rs.getInt(1) > 0; - } catch (SQLException e) { - throw new RuntimeException(e); - } - } - - public List<Task> getIncompleteTasks() { - try (Connection connection = config.getConnection()) { - List<Task> result = new LinkedList<>(); - ResultSet rs = connection.createStatement().executeQuery( - "SELECT initial_hash, target FROM ProofOfWorkTask WHERE nonce IS NULL"); - while (rs.next()) { - result.add(new Task( - rs.getBytes(1), - rs.getBytes(2) - )); - } - return result; - } catch (SQLException e) { - throw new RuntimeException(e); - } - } - - public void cleanupTasks(long ageInSeconds) { - try (Connection connection = config.getConnection()) { - PreparedStatement ps = connection.prepareStatement( - "DELETE FROM ProofOfWorkTask WHERE timestamp < ?"); - ps.setLong(1, UnixTime.now() - ageInSeconds); - ps.executeUpdate(); - } catch (SQLException e) { - throw new RuntimeException(e); - } - } - - public static class Task { - public final byte[] initialHash; - public final byte[] target; - - private Task(byte[] initialHash, byte[] target) { - this.initialHash = initialHash; - this.target = target; - } - } -} diff --git a/src/main/kotlin/ch/dissem/bitmessage/server/Constants.kt b/src/main/kotlin/ch/dissem/bitmessage/server/Constants.kt new file mode 100644 index 0000000..ad5a7ae --- /dev/null +++ b/src/main/kotlin/ch/dissem/bitmessage/server/Constants.kt @@ -0,0 +1,13 @@ +package ch.dissem.bitmessage.server + +/** + * Created by chrigu on 22.11.15. + */ +object Constants { + val ADMIN_LIST = "admins.conf" + val CLIENT_LIST = "clients.conf" + + val WHITELIST = "whitelist.conf" + val SHORTLIST = "shortlist.conf" + val BLACKLIST = "blacklist.conf" +} diff --git a/src/main/kotlin/ch/dissem/bitmessage/server/Converter.kt b/src/main/kotlin/ch/dissem/bitmessage/server/Converter.kt new file mode 100644 index 0000000..500d329 --- /dev/null +++ b/src/main/kotlin/ch/dissem/bitmessage/server/Converter.kt @@ -0,0 +1,55 @@ +/* + * Copyright 2015 Christian Basler + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package ch.dissem.bitmessage.server + +import ch.dissem.bitmessage.entity.BitmessageAddress +import ch.dissem.bitmessage.entity.Plaintext +import ch.dissem.bitmessage.server.entities.Broadcasts +import ch.dissem.bitmessage.server.entities.Message +import ch.dissem.bitmessage.server.entities.Sender +import ch.dissem.bitmessage.utils.UnixTime + +object Converter { + fun broadcasts(sender: BitmessageAddress, messages: Collection<Plaintext>) = Broadcasts().also { + it.sender = sender(sender) + it.messages = messages.map { message(it) }.toTypedArray() + } + + fun broadcasts(sender: BitmessageAddress, vararg messages: Message) = Broadcasts().also { + it.sender = sender(sender) + it.messages = arrayOf(*messages) + } + + fun sender(sender: BitmessageAddress) = Sender().apply { + address = sender.address + alias = sender.toString() + } + + fun message(subject: String, body: String) = Message().also { + it.id = 0 + it.received = UnixTime.now + it.subject = subject + it.body = body + } + + fun message(plaintext: Plaintext) = Message().apply { + id = plaintext.id + received = plaintext.sent + subject = plaintext.subject + body = plaintext.text + } +} diff --git a/src/main/java/ch/dissem/bitmessage/server/JabitServerApplication.java b/src/main/kotlin/ch/dissem/bitmessage/server/JabitServerApplication.kt similarity index 60% rename from src/main/java/ch/dissem/bitmessage/server/JabitServerApplication.java rename to src/main/kotlin/ch/dissem/bitmessage/server/JabitServerApplication.kt index 740d90f..93406c5 100644 --- a/src/main/java/ch/dissem/bitmessage/server/JabitServerApplication.java +++ b/src/main/kotlin/ch/dissem/bitmessage/server/JabitServerApplication.kt @@ -14,19 +14,25 @@ * limitations under the License. */ -package ch.dissem.bitmessage.server; +package ch.dissem.bitmessage.server -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ComponentScan; -import springfox.documentation.swagger2.annotations.EnableSwagger2; +import org.springframework.boot.SpringApplication +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.context.annotation.ComponentScan +import org.springframework.scheduling.annotation.EnableScheduling +import springfox.documentation.swagger2.annotations.EnableSwagger2 -@SpringBootApplication @EnableSwagger2 -@ComponentScan(basePackageClasses = JabitServerApplication.class) -public class JabitServerApplication { +@EnableScheduling +@SpringBootApplication +@ComponentScan(basePackageClasses = [JabitServerApplication::class]) +class JabitServerApplication { - public static void main(String[] args) { - SpringApplication.run(JabitServerApplication.class, args); + companion object { + @JvmStatic + fun main(args: Array<String>) { + SpringApplication.run(JabitServerApplication::class.java, *args) + } } + } diff --git a/src/main/kotlin/ch/dissem/bitmessage/server/JabitServerConfig.kt b/src/main/kotlin/ch/dissem/bitmessage/server/JabitServerConfig.kt new file mode 100644 index 0000000..b5f3665 --- /dev/null +++ b/src/main/kotlin/ch/dissem/bitmessage/server/JabitServerConfig.kt @@ -0,0 +1,193 @@ +/* + * Copyright 2015 Christian Basler + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package ch.dissem.bitmessage.server + +import ch.dissem.bitmessage.BitmessageContext +import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography +import ch.dissem.bitmessage.entity.BitmessageAddress +import ch.dissem.bitmessage.entity.payload.Pubkey +import ch.dissem.bitmessage.networking.nio.NioNetworkHandler +import ch.dissem.bitmessage.repository.* +import ch.dissem.bitmessage.server.Constants.ADMIN_LIST +import ch.dissem.bitmessage.server.Constants.BLACKLIST +import ch.dissem.bitmessage.server.Constants.CLIENT_LIST +import ch.dissem.bitmessage.server.Constants.SHORTLIST +import ch.dissem.bitmessage.server.Constants.WHITELIST +import ch.dissem.bitmessage.server.repository.ServerProofOfWorkRepository +import ch.dissem.bitmessage.utils.Singleton +import org.slf4j.LoggerFactory +import org.springframework.beans.factory.annotation.Value +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration +import org.springframework.context.annotation.DependsOn +import springfox.documentation.spi.DocumentationType +import springfox.documentation.spring.web.plugins.Docket + +@Configuration +class JabitServerConfig { + + @Value("\${bitmessage.port}") + private val port: Int = 0 + @Value("\${bitmessage.connection.ttl.hours}") + private val connectionTTL: Long = 0 + @Value("\${bitmessage.connection.limit}") + private val connectionLimit: Int = 0 + + @Value("\${database.url}") + private lateinit var dbUrl: String + @Value("\${database.user}") + private lateinit var dbUser: String + @Value("\${database.password}") + private var dbPassword: String? = null + + @Bean + fun jdbcConfig() = JdbcConfig(dbUrl, dbUser, dbPassword) + + @Bean + fun addressRepo() = JdbcAddressRepository(jdbcConfig()) + + @Bean + fun inventory() = JdbcInventory(jdbcConfig()) + + @Bean + fun labelRepo() = JdbcLabelRepository(jdbcConfig()) + + @Bean + fun messageRepo() = JdbcMessageRepository(jdbcConfig()) + + @Bean + fun proofOfWorkRepo() = JdbcProofOfWorkRepository(jdbcConfig()) + + @Bean + fun nodeRegistry() = JdbcNodeRegistry(jdbcConfig()) + + @Bean + fun networkHandler() = NioNetworkHandler() + + @Bean + fun cryptography() = BouncyCryptography().also { + Singleton.initialize(it) // needed for admins and clients + } + + @Bean + fun serverListener(): BitmessageContext.Listener = + ServerListener( + admins(), clients(), + whitelist(), shortlist(), blacklist() + ) + + @Bean + fun serverProofOfWorkRepository() = ServerProofOfWorkRepository(jdbcConfig()) + + @Bean + fun commandHandler() = ProofOfWorkRequestHandler(serverProofOfWorkRepository(), clients()) + + @Bean + fun bitmessageContext() = BitmessageContext.build { + addressRepo = addressRepo() + inventory = inventory() + labelRepo = labelRepo() + messageRepo = messageRepo() + nodeRegistry = nodeRegistry() + proofOfWorkRepo = proofOfWorkRepo() + networkHandler = networkHandler() + listener = serverListener() + customCommandHandler = commandHandler() + cryptography = cryptography() + preferences.port = port + preferences.connectionLimit = connectionLimit + preferences.connectionTTL = connectionTTL + } + + @Bean + @DependsOn("cryptography") + fun admins() = Utils.readOrCreateList( + ADMIN_LIST, + """# Admins can send commands to the server. + | + """.trimMargin() + ).map { BitmessageAddress(it) }.toMutableSet() + + @Bean + @DependsOn("cryptography") + fun clients() = Utils.readOrCreateList( + CLIENT_LIST, + "# Clients may send incomplete objects for proof of work.\n" + ).map { BitmessageAddress(it) }.toMutableSet() + + @Bean + fun whitelist() = Utils.readOrCreateList( + WHITELIST, + """# If there are any Bitmessage addresses in the whitelist, only those will be shown. + |# blacklist.conf will be ignored, but shortlist.conf will be applied to whitelisted addresses. + | + """.trimMargin() + ) + + @Bean + fun shortlist() = Utils.readOrCreateList( + SHORTLIST, + """"# Broadcasts of these addresses will be restricted to the last $SHORTLIST_SIZE entries. + | + |# Time Service: + |BM-BcbRqcFFSQUUmXFKsPJgVQPSiFA3Xash + | + |# Q's Aktivlist: + |BM-GtT7NLCCAu3HrT7dNTUTY9iDns92Z2ND + | + """.trimMargin() + ) + + @Bean + fun blacklist() = Utils.readOrCreateList( + BLACKLIST, + """# Bitmessage addresses in this file are being ignored and their broadcasts won't be returned. + | + """.trimMargin() + ) + + @Bean + fun api(): Docket = Docket(DocumentationType.SWAGGER_2) + .select() + .build() + + @Bean + fun identity(): BitmessageAddress { + val identities = bitmessageContext().addresses.getIdentities() + val identity: BitmessageAddress + if (identities.isEmpty()) { + LOG.info("Creating new identity...") + identity = bitmessageContext().createIdentity(false, Pubkey.Feature.DOES_ACK) + LOG.info("Identity " + identity.address + " created.") + } else { + LOG.info("Identities:") + identities.forEach { LOG.info(it.address) } + identity = identities[0] + if (identities.size > 1) { + LOG.info("Using " + identity) + } + } + LOG.info("QR Code:\n" + Utils.qrCode(identity)) + return identity + } + + companion object { + private val LOG = LoggerFactory.getLogger(JabitServerConfig::class.java) + + val SHORTLIST_SIZE = 5 + } +} diff --git a/src/main/kotlin/ch/dissem/bitmessage/server/JabitServerController.kt b/src/main/kotlin/ch/dissem/bitmessage/server/JabitServerController.kt new file mode 100644 index 0000000..7a687d2 --- /dev/null +++ b/src/main/kotlin/ch/dissem/bitmessage/server/JabitServerController.kt @@ -0,0 +1,110 @@ +/* + * Copyright 2015 Christian Basler + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package ch.dissem.bitmessage.server + +import ch.dissem.bitmessage.BitmessageContext +import ch.dissem.bitmessage.entity.BitmessageAddress +import ch.dissem.bitmessage.server.Converter.broadcasts +import ch.dissem.bitmessage.server.Converter.message +import ch.dissem.bitmessage.server.entities.Broadcasts +import org.springframework.scheduling.annotation.Scheduled +import org.springframework.web.bind.annotation.CrossOrigin +import org.springframework.web.bind.annotation.PathVariable +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RequestMethod.GET +import org.springframework.web.bind.annotation.RestController +import javax.annotation.PostConstruct +import javax.annotation.Resource +import javax.inject.Inject + +/** + * @author Christian Basler + */ +@CrossOrigin +@RestController +class JabitServerController { + + @Resource + private lateinit var whitelist: Set<String> + @Resource + private lateinit var shortlist: Set<String> + @Resource + private lateinit var blacklist: Set<String> + @Inject + private lateinit var identity: BitmessageAddress + @Inject + private lateinit var ctx: BitmessageContext + + @RequestMapping(value = ["identity"], method = [GET], produces = ["application/json"]) + fun identity() = """{ + "address": "${identity.address}", + "uri": "${Utils.getURL(identity, true)}" +}""" + + + @RequestMapping(value = ["status"], method = [GET], produces = ["application/json"]) + fun status() = "{${ctx.status()}}" + + @RequestMapping(value = ["read/{broadcastAddress}"], method = [GET]) + fun read(@PathVariable broadcastAddress: String): Broadcasts { + if ("test".equals(broadcastAddress, ignoreCase = true)) { + return broadcasts( + BitmessageAddress("BM-2cWhyaPxydemCeM8dWJUBmEo8iu7v2JptK"), + message("Test", "This is a test message. The rest service is running."), + message("Another Test", "And because it's such fun, a second message.") + ) + } + + var broadcaster = ctx.addresses.getAddress(broadcastAddress) + if (broadcaster == null) { + broadcaster = BitmessageAddress(broadcastAddress) + } + + if (!whitelist.isEmpty() && !whitelist.contains(broadcaster.address)) { + return broadcasts(broadcaster, message("Not Whitelisted", "Messages for " + broadcaster + + " can't be shown, as the sender isn't on the whitelist.")) + } + if (blacklist.contains(broadcaster.address)) { + return broadcasts(broadcaster, message("Blacklisted", "Unfortunately, " + broadcaster + + " is on the blacklist, so it's messages can't be shown.")) + } + + if (!broadcaster.isSubscribed) { + ctx.addSubscribtion(broadcaster) + } + val messages = ctx.messages.findMessages(broadcaster) + return if (shortlist.contains(broadcaster.address) && messages.size > SHORTLIST_SIZE) { + messages.listIterator(SHORTLIST_SIZE).forEach { ctx.messages.remove(it) } + broadcasts(broadcaster, messages.subList(0, SHORTLIST_SIZE)) + } else { + broadcasts(broadcaster, messages) + } + } + + @Scheduled(cron = "0 0 0 * * *") + fun broadcastStatus() = ctx.broadcast(identity, "Status", ctx.status().toString()) + + @Scheduled(cron = "0 0 2 * * *") + fun cleanup() = ctx.cleanup() + + @PostConstruct + fun setUp() = ctx.startup() + + companion object { + private val SHORTLIST_SIZE = 5 + } +} diff --git a/src/main/kotlin/ch/dissem/bitmessage/server/ProofOfWorkRequestHandler.kt b/src/main/kotlin/ch/dissem/bitmessage/server/ProofOfWorkRequestHandler.kt new file mode 100644 index 0000000..4b5835b --- /dev/null +++ b/src/main/kotlin/ch/dissem/bitmessage/server/ProofOfWorkRequestHandler.kt @@ -0,0 +1,122 @@ +/* + * Copyright 2015 Christian Basler + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package ch.dissem.bitmessage.server + +import ch.dissem.bitmessage.InternalContext +import ch.dissem.bitmessage.entity.BitmessageAddress +import ch.dissem.bitmessage.entity.CustomMessage +import ch.dissem.bitmessage.entity.MessagePayload +import ch.dissem.bitmessage.entity.valueobject.PrivateKey +import ch.dissem.bitmessage.exception.DecryptionFailedException +import ch.dissem.bitmessage.extensions.CryptoCustomMessage +import ch.dissem.bitmessage.extensions.pow.ProofOfWorkRequest +import ch.dissem.bitmessage.extensions.pow.ProofOfWorkRequest.Request.CALCULATING +import ch.dissem.bitmessage.extensions.pow.ProofOfWorkRequest.Request.COMPLETE +import ch.dissem.bitmessage.ports.CustomCommandHandler +import ch.dissem.bitmessage.ports.ProofOfWorkEngine +import ch.dissem.bitmessage.server.repository.ServerProofOfWorkRepository +import ch.dissem.bitmessage.utils.UnixTime.DAY +import org.slf4j.LoggerFactory +import java.util.* +import kotlin.concurrent.schedule + +/** + * @author Christian Basler + */ +class ProofOfWorkRequestHandler(private val repo: ServerProofOfWorkRepository, clients: Collection<BitmessageAddress>) : CustomCommandHandler, InternalContext.ContextHolder { + + private val decryptionKeys = clients.map { it.publicDecryptionKey } + private lateinit var engine: ProofOfWorkEngine + private lateinit var context: InternalContext + + private val identity: BitmessageAddress by lazy { + context.addressRepository.getIdentities().firstOrNull() ?: BitmessageAddress(PrivateKey( + false, + context.streams[0], + InternalContext.NETWORK_NONCE_TRIALS_PER_BYTE, + InternalContext.NETWORK_EXTRA_BYTES + )).also { context.addressRepository.save(it) } + } + + init { + Timer().schedule(15000) { + doMissingProofOfWork() + } // wait 15 seconds + Timer().schedule(60000, DAY * 1000) { + repo.cleanupTasks(7 * DAY) + } // First time after 1 minute, then daily + } + + fun doMissingProofOfWork() { + val incompleteTasks = repo.getIncompleteTasks() + LOG.info("Doing POW for ${incompleteTasks.size} tasks.") + for (task in incompleteTasks) { + engine.calculateNonce(task.initialHash, task.target) { initalHash, nonce -> repo.updateTask(initalHash, nonce) } + } + } + + override fun handle(request: CustomMessage): MessagePayload? { + val cryptoMessage = CryptoCustomMessage.read(request) { client, input -> + ProofOfWorkRequest.read(client, input) + } + val decryptedRequest = decrypt(cryptoMessage) ?: return CustomMessage.error( + "Unknown sender. Please ask the server's administrator to add you as a client. For this he'll need your identity." + ) + when (decryptedRequest.request) { + ProofOfWorkRequest.Request.CALCULATE -> { + if (!repo.hasTask(decryptedRequest.initialHash)) { + repo.storeTask(decryptedRequest) + // TODO: This is probably the place to do some book-keeping + // if we want to bill our customers. + engine.calculateNonce(decryptedRequest.initialHash, decryptedRequest.data) { initalHash, nonce -> repo.updateTask(initalHash, nonce) } + return CryptoCustomMessage( + ProofOfWorkRequest(identity, decryptedRequest.initialHash, CALCULATING, ByteArray(0)) + ) + } else { + val nonce = repo.getNonce(decryptedRequest) + return CryptoCustomMessage( + if (nonce != null) { + ProofOfWorkRequest(identity, decryptedRequest.initialHash, COMPLETE, nonce) + } else { + ProofOfWorkRequest(identity, decryptedRequest.initialHash, CALCULATING, ByteArray(0)) + } + ).apply { signAndEncrypt(identity, decryptedRequest.sender.pubkey!!.encryptionKey) } + } + } + else -> return null + } + } + + private fun decrypt(cryptoMessage: CryptoCustomMessage<ProofOfWorkRequest>): ProofOfWorkRequest? { + for (key in decryptionKeys) { + try { + return cryptoMessage.decrypt(key) + } catch (_: DecryptionFailedException) { + } + } + return null + } + + override fun setContext(context: InternalContext) { + this.context = context + this.engine = context.proofOfWorkEngine + } + + companion object { + private val LOG = LoggerFactory.getLogger(ProofOfWorkRequestHandler::class.java) + } +} diff --git a/src/main/kotlin/ch/dissem/bitmessage/server/ServerListener.kt b/src/main/kotlin/ch/dissem/bitmessage/server/ServerListener.kt new file mode 100644 index 0000000..0a58a5b --- /dev/null +++ b/src/main/kotlin/ch/dissem/bitmessage/server/ServerListener.kt @@ -0,0 +1,171 @@ +/* + * Copyright 2015 Christian Basler + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package ch.dissem.bitmessage.server + +import ch.dissem.bitmessage.BitmessageContext +import ch.dissem.bitmessage.entity.BitmessageAddress +import ch.dissem.bitmessage.entity.Plaintext +import ch.dissem.bitmessage.entity.Plaintext.Encoding.EXTENDED +import ch.dissem.bitmessage.entity.Plaintext.Type.MSG +import ch.dissem.bitmessage.entity.valueobject.extended.Message +import ch.dissem.bitmessage.server.Constants.ADMIN_LIST +import ch.dissem.bitmessage.server.Constants.BLACKLIST +import ch.dissem.bitmessage.server.Constants.CLIENT_LIST +import ch.dissem.bitmessage.server.Constants.SHORTLIST +import ch.dissem.bitmessage.server.Constants.WHITELIST +import org.slf4j.LoggerFactory +import java.util.* + +/** + * @author Christian Basler + */ +class ServerListener(private val admins: MutableCollection<BitmessageAddress>, + private val clients: MutableCollection<BitmessageAddress>, + private val whitelist: MutableCollection<String>, + private val shortlist: MutableCollection<String>, + private val blacklist: MutableCollection<String>) : BitmessageContext.Listener.WithContext { + + private lateinit var ctx: BitmessageContext + private val identity: BitmessageAddress by lazy { + val identities = ctx.addresses.getIdentities() + if (identities.isEmpty()) { + ctx.createIdentity(false) + } else { + identities[0] + } + } + + override fun setContext(ctx: BitmessageContext) { + this.ctx = ctx + } + + override fun receive(plaintext: Plaintext) { + if (admins.contains(plaintext.from)) { + val command = plaintext.subject!!.trim { it <= ' ' }.toLowerCase().split("\\s+".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray() + val data = plaintext.text + if (command.size == 1) { + when (command[0].toLowerCase()) { + "status" -> { + val response = Plaintext.Builder(MSG) + response.from(identity) + response.to(plaintext.from) + if (plaintext.encoding == EXTENDED) { + response.message( + Message.Builder() + .subject("RE: status") + .body(ctx.status().toString()) + .addParent(plaintext) + .build() + ) + } else { + response.message("RE: status", ctx.status().toString()) + } + ctx.send(response.build()) + } + else -> LOG.info("ignoring unknown command " + plaintext.subject!!) + } + } else if (command.size == 2) { + when (command[1].toLowerCase()) { + "client", "clients" -> updateUserList(CLIENT_LIST, clients, command[0], data) + "admin", "admins", "administrator", "administrators" -> updateUserList(ADMIN_LIST, admins, command[0], data) + "whitelist" -> updateList(WHITELIST, whitelist, command[0], data) + "shortlist" -> updateList(SHORTLIST, shortlist, command[0], data) + "blacklist" -> updateList(BLACKLIST, blacklist, command[0], data) + else -> LOG.info("ignoring unknown command " + plaintext.subject!!) + } + } + } + } + + private fun updateUserList(file: String, list: MutableCollection<BitmessageAddress>, command: String, data: String?) { + when (command.toLowerCase()) { + "set" -> { + list.clear() + val scanner = Scanner(data!!) + while (scanner.hasNextLine()) { + val line = scanner.nextLine() + try { + list.add(BitmessageAddress(line)) + } catch (e: Exception) { + LOG.info("$command $file: ignoring line: $line") + } + + } + Utils.saveList(file, list.map { it.address }) + } + "add" -> { + val scanner = Scanner(data!!) + while (scanner.hasNextLine()) { + val line = scanner.nextLine() + try { + list.add(BitmessageAddress(line)) + } catch (e: Exception) { + LOG.info("$command $file: ignoring line: $line") + } + + } + Utils.saveList(file, list.map { it.address }) + } + "remove" -> { + list.removeIf { address -> data!!.contains(address.address) } + Utils.saveList(file, list.map { it.address }) + } + else -> LOG.info("unknown command $command on list $file") + } + } + + private fun updateList(file: String, list: MutableCollection<String>, command: String, data: String?) { + when (command.toLowerCase()) { + "set" -> { + list.clear() + val scanner = Scanner(data!!) + while (scanner.hasNextLine()) { + val line = scanner.nextLine() + try { + list.add(BitmessageAddress(line).address) + } catch (e: Exception) { + LOG.info("$command $file: ignoring line: $line") + } + + } + Utils.saveList(file, list) + } + "add" -> { + val scanner = Scanner(data!!) + while (scanner.hasNextLine()) { + val line = scanner.nextLine() + try { + list.add(BitmessageAddress(line).address) + } catch (e: Exception) { + LOG.info("$command $file: ignoring line: $line") + } + + } + Utils.saveList(file, list) + } + "remove" -> { + list.removeAll { data!!.contains(it) } + Utils.saveList(file, list) + } + else -> LOG.info("unknown command $command on list $file") + } + } + + companion object { + private val LOG = LoggerFactory.getLogger(ServerListener::class.java) + } +} diff --git a/src/main/java/ch/dissem/bitmessage/server/ServletInitializer.java b/src/main/kotlin/ch/dissem/bitmessage/server/ServletInitializer.kt similarity index 65% rename from src/main/java/ch/dissem/bitmessage/server/ServletInitializer.java rename to src/main/kotlin/ch/dissem/bitmessage/server/ServletInitializer.kt index 5f4bdf2..0a348aa 100644 --- a/src/main/java/ch/dissem/bitmessage/server/ServletInitializer.java +++ b/src/main/kotlin/ch/dissem/bitmessage/server/ServletInitializer.kt @@ -14,16 +14,15 @@ * limitations under the License. */ -package ch.dissem.bitmessage.server; +package ch.dissem.bitmessage.server -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.context.web.SpringBootServletInitializer; +import org.springframework.boot.builder.SpringApplicationBuilder +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer -public class ServletInitializer extends SpringBootServletInitializer { +class ServletInitializer : SpringBootServletInitializer() { - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(JabitServerApplication.class); - } + override fun configure(application: SpringApplicationBuilder): SpringApplicationBuilder { + return application.sources(JabitServerApplication::class.java) + } } diff --git a/src/main/kotlin/ch/dissem/bitmessage/server/Utils.kt b/src/main/kotlin/ch/dissem/bitmessage/server/Utils.kt new file mode 100644 index 0000000..6676dc6 --- /dev/null +++ b/src/main/kotlin/ch/dissem/bitmessage/server/Utils.kt @@ -0,0 +1,129 @@ +/* + * Copyright 2015 Christian Basler + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package ch.dissem.bitmessage.server + +import ch.dissem.bitmessage.entity.BitmessageAddress +import com.google.zxing.WriterException +import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel +import com.google.zxing.qrcode.encoder.Encoder +import com.google.zxing.qrcode.encoder.QRCode +import org.slf4j.LoggerFactory +import java.io.ByteArrayOutputStream +import java.io.File +import java.io.FileWriter +import java.nio.file.Files +import java.util.* + +object Utils { + private val LOG = LoggerFactory.getLogger(Utils::class.java) + + fun readOrCreateList(filename: String, content: String): MutableSet<String> { + val file = File(filename).apply { + if (!exists()) { + if (createNewFile()) { + FileWriter(this).use { fw -> fw.write(content) } + } + } + } + return readList(file) + } + + fun saveList(filename: String, content: Collection<String>) { + FileWriter(filename).use { fw -> + content.forEach { l -> + fw.write(l) + fw.write(System.lineSeparator()) + } + } + } + + fun readList(file: File) = Files.readAllLines(file.toPath()) + .map { it.trim { it <= ' ' } } + .filter { it.startsWith("BM-") } + .toMutableSet() + + fun getURL(address: BitmessageAddress, includeKey: Boolean): String { + val attributes = mutableListOf<String>() + if (address.alias != null) { + attributes.add("label=${address.alias}") + } + if (includeKey) { + address.pubkey?.let { pubkey -> + val out = ByteArrayOutputStream() + pubkey.writer().writeUnencrypted(out) + attributes.add("pubkey=${Base64.getUrlEncoder().encodeToString(out.toByteArray())}") + } + } + + return if (attributes.isEmpty()) { + "bitmessage:${address.address}" + } else { + "bitmessage:${address.address}?${attributes.joinToString(separator = "&")}" + } + } + + fun qrCode(address: BitmessageAddress): String { + val code: QRCode + try { + code = Encoder.encode(getURL(address, false), ErrorCorrectionLevel.L, null) + } catch (e: WriterException) { + LOG.error(e.message, e) + return "" + } + + val matrix = code.matrix + val result = StringBuilder() + for (i in 0..1) { + for (j in 0 until matrix.width + 8) { + result.append('█') + } + result.append('\n') + } + run { + var i = 0 + while (i < matrix.height) { + result.append("████") + for (j in 0 until matrix.width) { + if (matrix.get(i, j) > 0) { + if (matrix.height > i + 1 && matrix.get(i + 1, j) > 0) { + result.append(' ') + } else { + result.append('▄') + } + } else { + if (matrix.height > i + 1 && matrix.get(i + 1, j) > 0) { + result.append('▀') + } else { + result.append('█') + } + } + } + result.append("████\n") + i += 2 + } + } + for (i in 0..1) { + for (j in 0 until matrix.width + 8) { + result.append('█') + } + result.append('\n') + } + return result.toString() + } + + fun zero(nonce: ByteArray) = nonce.none { it.toInt() != 0 } +} diff --git a/src/main/java/ch/dissem/bitmessage/server/entities/Broadcasts.java b/src/main/kotlin/ch/dissem/bitmessage/server/entities/Broadcasts.kt similarity index 71% rename from src/main/java/ch/dissem/bitmessage/server/entities/Broadcasts.java rename to src/main/kotlin/ch/dissem/bitmessage/server/entities/Broadcasts.kt index 1349a0f..07d3153 100644 --- a/src/main/java/ch/dissem/bitmessage/server/entities/Broadcasts.java +++ b/src/main/kotlin/ch/dissem/bitmessage/server/entities/Broadcasts.kt @@ -14,17 +14,12 @@ * limitations under the License. */ -package ch.dissem.bitmessage.server.entities; - -import ch.dissem.bitmessage.entity.BitmessageAddress; -import ch.dissem.bitmessage.entity.Plaintext; - -import java.util.Collection; +package ch.dissem.bitmessage.server.entities /** * JSON representation for the broadcasts of a specific sender */ -public class Broadcasts { - public Sender sender; - public Message[] messages; -} +data class Broadcasts( + var sender: Sender? = null, + var messages: Array<Message> = emptyArray() +) diff --git a/src/main/java/ch/dissem/bitmessage/server/entities/Message.java b/src/main/kotlin/ch/dissem/bitmessage/server/entities/Message.kt similarity index 67% rename from src/main/java/ch/dissem/bitmessage/server/entities/Message.java rename to src/main/kotlin/ch/dissem/bitmessage/server/entities/Message.kt index 07038d6..ceaa5b0 100644 --- a/src/main/java/ch/dissem/bitmessage/server/entities/Message.java +++ b/src/main/kotlin/ch/dissem/bitmessage/server/entities/Message.kt @@ -14,20 +14,14 @@ * limitations under the License. */ -package ch.dissem.bitmessage.server.entities; - -import ch.dissem.bitmessage.entity.Plaintext; -import ch.dissem.bitmessage.utils.UnixTime; - -import java.time.Instant; -import java.time.ZonedDateTime; +package ch.dissem.bitmessage.server.entities /** * JSON representation for plaintext messages */ -public class Message { - public Object id; - public Long received; - public String subject; - public String body; -} +data class Message( + var id: Any? = null, + var received: Long? = null, + var subject: String? = null, + var body: String? = null +) diff --git a/src/main/java/ch/dissem/bitmessage/server/entities/Sender.java b/src/main/kotlin/ch/dissem/bitmessage/server/entities/Sender.kt similarity index 78% rename from src/main/java/ch/dissem/bitmessage/server/entities/Sender.java rename to src/main/kotlin/ch/dissem/bitmessage/server/entities/Sender.kt index b61833c..24df62e 100644 --- a/src/main/java/ch/dissem/bitmessage/server/entities/Sender.java +++ b/src/main/kotlin/ch/dissem/bitmessage/server/entities/Sender.kt @@ -14,14 +14,12 @@ * limitations under the License. */ -package ch.dissem.bitmessage.server.entities; - -import ch.dissem.bitmessage.entity.BitmessageAddress; +package ch.dissem.bitmessage.server.entities /** * JSON representation for a BitmessageAddress */ -public class Sender { - public String address; - public String alias; -} +data class Sender( + var address: String? = null, + var alias: String? = null +) diff --git a/src/main/java/ch/dissem/bitmessage/server/entities/Update.java b/src/main/kotlin/ch/dissem/bitmessage/server/entities/Update.kt similarity index 71% rename from src/main/java/ch/dissem/bitmessage/server/entities/Update.java rename to src/main/kotlin/ch/dissem/bitmessage/server/entities/Update.kt index 3aebada..9e898d3 100644 --- a/src/main/java/ch/dissem/bitmessage/server/entities/Update.java +++ b/src/main/kotlin/ch/dissem/bitmessage/server/entities/Update.kt @@ -14,17 +14,9 @@ * limitations under the License. */ -package ch.dissem.bitmessage.server.entities; +package ch.dissem.bitmessage.server.entities /** * @author Christian Basler */ -public class Update<T> { - public final T oldValue; - public final T newValue; - - public Update(T oldValue, T newValue) { - this.oldValue = oldValue; - this.newValue = newValue; - } -} +data class Update<T>(val oldValue: T, val newValue: T) diff --git a/src/main/kotlin/ch/dissem/bitmessage/server/repository/ServerProofOfWorkRepository.kt b/src/main/kotlin/ch/dissem/bitmessage/server/repository/ServerProofOfWorkRepository.kt new file mode 100644 index 0000000..0fbcfdb --- /dev/null +++ b/src/main/kotlin/ch/dissem/bitmessage/server/repository/ServerProofOfWorkRepository.kt @@ -0,0 +1,107 @@ +/* + * Copyright 2015 Christian Basler + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package ch.dissem.bitmessage.server.repository + +import ch.dissem.bitmessage.extensions.pow.ProofOfWorkRequest +import ch.dissem.bitmessage.repository.JdbcConfig +import ch.dissem.bitmessage.repository.JdbcHelper +import ch.dissem.bitmessage.utils.UnixTime +import java.util.* + +/** + * @author Christian Basler + */ +class ServerProofOfWorkRepository(config: JdbcConfig) : JdbcHelper(config) { + + fun getIncompleteTasks(): List<Task> { + config.getConnection().use { connection -> + val result = LinkedList<Task>() + val rs = connection.createStatement().executeQuery( + "SELECT initial_hash, target FROM ProofOfWorkTask WHERE nonce IS NULL") + while (rs.next()) { + result.add(Task( + rs.getBytes(1), + rs.getBytes(2) + )) + } + return result + } + } + + /** + * client (can be removed once the new IV is returned) + * IV (without nonce) + * IV (with nonce, can be removed once the new IV is returned) + * status: calculating, finished, confirmed + * data (can be removed once POW calculation is done) + */ + fun storeTask(request: ProofOfWorkRequest) { + config.getConnection().use { connection -> + val ps = connection.prepareStatement( + "INSERT INTO ProofOfWorkTask (initial_hash, client, target, timestamp) VALUES (?, ?, ?, ?)") + ps.setBytes(1, request.initialHash) + ps.setString(2, request.sender.address) + ps.setBytes(3, request.data) + ps.setLong(4, UnixTime.now) + ps.executeUpdate() + } + } + + fun updateTask(initalHash: ByteArray, nonce: ByteArray) { + config.getConnection().use { connection -> + val ps = connection.prepareStatement( + "UPDATE ProofOfWorkTask SET nonce = ? WHERE initial_hash = ?") + ps.setBytes(1, nonce) + ps.setBytes(2, initalHash) + ps.executeUpdate() + } + } + + fun getNonce(request: ProofOfWorkRequest): ByteArray? { + config.getConnection().use { connection -> + val ps = connection.prepareStatement("SELECT nonce FROM ProofOfWorkTask WHERE initial_hash = ?") + ps.setBytes(1, request.initialHash) + val rs = ps.executeQuery() + return if (rs.next()) { + rs.getBytes(1) + } else { + null + } + } + } + + fun hasTask(initialHash: ByteArray): Boolean { + config.getConnection().use { connection -> + val ps = connection.prepareStatement("SELECT count(1) FROM ProofOfWorkTask WHERE initial_hash = ?") + ps.setBytes(1, initialHash) + val rs = ps.executeQuery() + rs.next() + return rs.getInt(1) > 0 + } + } + + fun cleanupTasks(ageInSeconds: Long) { + config.getConnection().use { connection -> + val ps = connection.prepareStatement( + "DELETE FROM ProofOfWorkTask WHERE timestamp < ?") + ps.setLong(1, UnixTime.now - ageInSeconds) + ps.executeUpdate() + } + } + + class Task internal constructor(val initialHash: ByteArray, val target: ByteArray) +} diff --git a/src/test/java/ch/dissem/bitmessage/server/JabitServerApplicationTests.java b/src/test/java/ch/dissem/bitmessage/server/JabitServerApplicationTests.java deleted file mode 100644 index ab6ed9a..0000000 --- a/src/test/java/ch/dissem/bitmessage/server/JabitServerApplicationTests.java +++ /dev/null @@ -1,18 +0,0 @@ -package ch.dissem.bitmessage.server; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.SpringApplicationConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -@RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = JabitServerApplication.class) -@WebAppConfiguration -public class JabitServerApplicationTests { - - @Test - public void contextLoads() { - } - -} diff --git a/src/test/java/ch/dissem/bitmessage/server/JabitServerApplicationTests.kt b/src/test/java/ch/dissem/bitmessage/server/JabitServerApplicationTests.kt new file mode 100644 index 0000000..a2d3ba7 --- /dev/null +++ b/src/test/java/ch/dissem/bitmessage/server/JabitServerApplicationTests.kt @@ -0,0 +1,17 @@ +package ch.dissem.bitmessage.server + +import org.junit.Test +import org.junit.runner.RunWith +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner +import org.springframework.test.context.web.WebAppConfiguration + +@WebAppConfiguration +@RunWith(SpringJUnit4ClassRunner::class) +@SpringBootTest(classes = [JabitServerApplication::class]) +class JabitServerApplicationTests { + + @Test + fun contextLoads() = Unit + +} diff --git a/webapp/.editorconfig b/webapp/.editorconfig deleted file mode 100644 index c2cdfb8..0000000 --- a/webapp/.editorconfig +++ /dev/null @@ -1,21 +0,0 @@ -# EditorConfig helps developers define and maintain consistent -# coding styles between different editors and IDEs -# editorconfig.org - -root = true - - -[*] - -# Change these settings to your own preference -indent_style = space -indent_size = 2 - -# We recommend you to keep these unchanged -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - -[*.md] -trim_trailing_whitespace = false diff --git a/webapp/.gitattributes b/webapp/.gitattributes deleted file mode 100644 index 2125666..0000000 --- a/webapp/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* text=auto \ No newline at end of file diff --git a/webapp/.gitignore b/webapp/.gitignore deleted file mode 100644 index fdb1b10..0000000 --- a/webapp/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -node_modules -dist -bower_components -.tmp diff --git a/webapp/.jscsrc b/webapp/.jscsrc deleted file mode 100644 index 880a269..0000000 --- a/webapp/.jscsrc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "preset": "google", - "disallowSpacesInAnonymousFunctionExpression": null, - "excludeFiles": ["node_modules/**"] -} diff --git a/webapp/.jshintrc b/webapp/.jshintrc deleted file mode 100644 index f30ce1e..0000000 --- a/webapp/.jshintrc +++ /dev/null @@ -1,24 +0,0 @@ -{ - "node": true, - "browser": true, - "bitwise": true, - "camelcase": true, - "curly": true, - "eqeqeq": true, - "immed": true, - "indent": 2, - "latedef": true, - "noarg": true, - "quotmark": "single", - "undef": true, - "unused": true, - "newcap": false, - "globals": { - "wrap": true, - "unwrap": true, - "Polymer": true, - "Platform": true, - "page": true, - "app": true - } -} diff --git a/webapp/LICENSE.md b/webapp/LICENSE.md deleted file mode 100644 index bb3f440..0000000 --- a/webapp/LICENSE.md +++ /dev/null @@ -1,19 +0,0 @@ -# License - -Everything in this repo is BSD style license unless otherwise specified. - -Copyright (c) 2015 The Polymer Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. -* Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/webapp/README.md b/webapp/README.md deleted file mode 100644 index ccd6f12..0000000 --- a/webapp/README.md +++ /dev/null @@ -1,364 +0,0 @@ -![](https://cloud.githubusercontent.com/assets/110953/7877439/6a69d03e-0590-11e5-9fac-c614246606de.png) -## Polymer Starter Kit - -> A starting point for building web applications with Polymer 1.0 - -### Included out of the box: - -* [Polymer](http://polymer-project.org), [Paper](https://elements.polymer-project.org/browse?package=paper-elements), [Iron](https://elements.polymer-project.org/browse?package=iron-elements) and [Neon](https://elements.polymer-project.org/browse?package=neon-elements) elements -* [Material Design](http://www.google.com/design/spec/material-design/introduction.html) layout -* Routing with [Page.js](https://visionmedia.github.io/page.js/) -* Unit testing with [Web Component Tester](https://github.com/Polymer/web-component-tester) -* Optional offline setup through [Platinum](https://elements.polymer-project.org/browse?package=platinum-elements) Service Worker elements -* End-to-end Build Tooling (including [Vulcanize](https://github.com/Polymer/vulcanize)) - -## Getting Started - -To take advantage of Polymer Starter Kit you need to: - -1. Get a copy of the code. -2. Install the dependencies if you don't already have them. -3. Modify the application to your liking. -4. Deploy your production code. - -### Get the code - -[Download](https://github.com/polymerelements/polymer-starter-kit/releases/latest) and extract Polymer Starter Kit to where you want to work. The project comes in two flavours - Light and Full. - -**Beginners**: Try Polymer Starter Kit Light. This doesn't require any extra dependencies nor knowledge of modern front-end tooling. This option is good for prototyping if you haven't build a Polymer app before. - -**Intermediate - Advanced**: Use the full version of Polymer Starter Kit. This comes with all the build tools you'll need for testing and productionising your app so it's nice and lean. You'll need to run a few extra commands to install the tools we recommend but it's worth it to make sure your final app is super optimised. - -Rob Dodson has a fantastic [PolyCast video](https://www.youtube.com/watch?v=xz-yixRxZN8) available that walks through using Polymer Starter Kit. An [end-to-end with Polymer](https://www.youtube.com/watch?v=1f_Tj_JnStA) and Polymer Starter Kit talk is also available. - -### Install dependencies - -#### Quick-start (for experienced users) - -With Node.js installed, run the following one liner from the root of your Polymer Starter Kit download: - -```sh -npm install -g gulp bower && npm install && bower install -``` - -#### Prerequisites (for everyone) - -The full starter kit requires the following major dependencies: - -- Node.js, used to run JavaScript tools from the command line. -- npm, the node package manager, installed with Node.js and used to install Node.js packages. -- gulp, a Node.js-based build tool. -- bower, a Node.js-based package manager used to install front-end packages (like Polymer). - -**To install dependencies:** - -1) Check your Node.js version. - -```sh -node --version -``` - -The version should be at or above 0.12.x. - -2) If you don't have Node.js installed, or you have a lower version, go to [nodejs.org](https://nodejs.org) and click on the big green Install button. - -3) Install `gulp` and `bower` globally. - -```sh -npm install -g gulp bower -``` - -This lets you run `gulp` and `bower` from the command line. - -4) Install the starter kit's local `npm` and `bower` dependencies. - -```sh -cd polymer-starter-kit && npm install && bower install -``` - -This installs the element sets (Paper, Iron, Platinum) and tools the starter kit requires to build and serve apps. - -### Development workflow - -#### Serve / watch - -```sh -gulp serve -``` - -This outputs an IP address you can use to locally test and another that can be used on devices connected to your network. - -#### Run tests - -```sh -gulp test:local -``` - -This runs the unit tests defined in the `app/test` directory through [web-component-tester](https://github.com/Polymer/web-component-tester). - -To run tests Java 7 or higher is required. To update Java go to http://www.oracle.com/technetwork/java/javase/downloads/index.html and download ***JDK*** and install it. - -#### Build & Vulcanize - -```sh -gulp -``` - -Build and optimize the current project, ready for deployment. This includes linting as well as vulcanization, image, script, stylesheet and HTML optimization and minification. - -## Application Theming & Styling - -Polymer 1.0 introduces a shim for CSS custom properties. We take advantage of this in `app/styles/app-theme.html` to provide theming for your application. You can also find our presets for Material Design breakpoints in this file. - -[Read more](https://www.polymer-project.org/1.0/docs/devguide/styling.html) about CSS custom properties. - -### Styling -1. ***main.css*** - to define styles that can be applied outside of Polymer's custom CSS properties implementation. Some of the use-cases include defining styles that you want to be applied for a splash screen, styles for your application 'shell' before it gets upgraded using Polymer or critical style blocks that you want parsed before your elements are. -2. ***app-theme.html*** - to provide theming for your application. You can also find our presets for Material Design breakpoints in this file. -3. ***shared-styles.html*** - to shared styles between elements and index.html. -4. ***element styles only*** - styles specific to element. These styles should be inside the `<style></style>` inside `template`. - - ```HTML - <dom-module id="my-list"> - <template> - <style> - :host { - display: block; - background-color: yellow; - } - </style> - <ul> - <template is="dom-repeat" items="{{items}}"> - <li><span class="paper-font-body1">{{item}}</span></li> - </template> - </ul> - </template> - </dom-module> - ``` - -These style files are located in the [styles folder](app/styles/). - -## Unit Testing - -Web apps built with Polymer Starter Kit come configured with support for [Web Component Tester](https://github.com/Polymer/web-component-tester) - Polymer's preferred tool for authoring and running unit tests. This makes testing your element based applications a pleasant experience. - -[Read more](https://github.com/Polymer/web-component-tester#html-suites) about using Web Component tester. - -## Dependency Management - -Polymer uses [Bower](http://bower.io) for package management. This makes it easy to keep your elements up to date and versioned. For tooling, we use npm to manage Node.js-based dependencies. - -## Service Worker - -Polymer Starter Kit offers an optional offline experience thanks to Service Worker and the [Platinum Service Worker elements](https://github.com/PolymerElements/platinum-sw). New to Service Worker? Read the following [introduction](http://www.html5rocks.com/en/tutorials/service-worker/introduction/) to understand how it works. - -Our optional offline setup should work well for relatively simple applications. For more complex apps, we recommend learning how Service Worker works so that you can make the most of the Platinum Service Worker element abstractions. - -### Enable Service Worker support? - -To enable Service Worker support for Polymer Starter Kit project use these 3 steps: - -1. Uncomment Service Worker code in index.html - ```HTML - <!-- Uncomment next block to enable Service Worker support (1/2) --> - <!-- - <paper-toast id="caching-complete" - duration="6000" - text="Caching complete! This app will work offline."> - </paper-toast> - - <platinum-sw-register auto-register - clients-claim - skip-waiting - on-service-worker-installed="displayInstalledToast"> - <platinum-sw-cache default-cache-strategy="networkFirst" - precache-file="precache.json"> - </platinum-sw-cache> - </platinum-sw-register> - --> - ``` -2. Uncomment Service Worker code in elements.html - - ```HTML - <!-- Uncomment next block to enable Service Worker Support (2/2) --> - <!-- - <link rel="import" href="../bower_components/platinum-sw/platinum-sw-cache.html"> - <link rel="import" href="../bower_components/platinum-sw/platinum-sw-register.html"> - --> - ``` -3. Uncomment 'cache-config' in the `runSequence()` section of the 'default' gulp task, like below: -[(gulpfile.js)](https://github.com/PolymerElements/polymer-starter-kit/blob/master/gulpfile.js) - - ```JavaScript - // Build Production Files, the Default Task - gulp.task('default', ['clean'], function (cb) { - runSequence( - ['copy', 'styles'], - 'elements', - ['jshint', 'images', 'fonts', 'html'], - 'vulcanize', 'cache-config', - cb); - }); - ``` - -#### Filing bugs in the right place - -If you experience an issue with Service Worker support in your application, check the origin of the issue and use the appropriate issue tracker: - -* [sw-toolbox](https://github.com/GoogleChrome/sw-toolbox/issues) -* [platinum-sw](https://github.com/PolymerElements/platinum-sw/issues) -* [platinum-push-notifications-manager](https://github.com/PolymerElements/push-notification-manager/) -* For all other issues, feel free to file them [here](https://github.com/polymerelements/polymer-starter-kit/issues). - -#### I get an error message about "Only secure origins are allowed" - -Service Workers are only available to "secure origins" (HTTPS sites, basically) in line with a policy to prefer secure origins for powerful new features. However http://localhost is also considered a secure origin, so if you can, developing on localhost is an easy way to avoid this error. For production, your site will need to support HTTPS. - -#### How do I debug Service Worker? - -If you need to debug the event listener wire-up use `chrome://serviceworker-internals`. - -#### What are those buttons on chrome://serviceworker-internals? - -This page shows your registered workers and provides some basic operations. - -* Unregister: Unregisters the worker. -* Start: Starts the worker. This would happen automatically when you navigate to a page in the worker's scope. -* Stop: Stops the worker. -* Sync: Dispatches a 'sync' event to the worker. If you don't handle this event, nothing will happen. -* Push: Dispatches a 'push' event to the worker. If you don't handle this event, nothing will happen. -* Inspect: Opens the worker in the Inspector. - -#### Development flow - -In order to guarantee that the latest version of your Service Worker script is being used, follow these instructions: - -* After you made changes to your service worker script, close all but one of the tabs pointing to your web application -* Hit shift-reload to bypass the service worker as to ensure that the remaining tab isn't under the control of a service worker -* Hit reload to let the newer version of the Service Worker control the page. - -If you find anything to still be stale, you can also try navigating to `chrome:serviceworker-internals` (in Chrome), finding the relevant Service Worker entry for your application and clicking 'Unregister' before refreshing your app. This will (of course) only clear it from the local development machine. If you have already deployed to production then further work will be necessary to remove it from your user's machines. - -#### Disable Service Worker support after you enabled it - -If for any reason you need to disable Service Worker support after previously enabling it, you can remove it from your Polymer Starter Kit project using these 4 steps: - -1. Remove references to the platinum-sw elements from your application [index](https://github.com/PolymerElements/polymer-starter-kit/blob/master/app/index.html). -2. Remove the two Platinum Service Worker elements (platinum-sw/..) in [app/elements/elements.html](https://github.com/PolymerElements/polymer-starter-kit/blob/master/app/elements/elements.html) -3. Remove 'precache' from the list in the 'default' gulp task ([gulpfile.js](https://github.com/PolymerElements/polymer-starter-kit/blob/master/gulpfile.js)) -4. Navigate to `chrome://serviceworker-internals` and unregister any Service Workers registered by Polymer Starter Kit for your app just in case there's a copy of it cached. - -## Yeoman support - -[generator-polymer](https://github.com/yeoman/generator-polymer/releases) now includes support for Polymer Starter Kit out of the box. - -## Frequently Asked Questions - -### Where do I customise my application theme? - -Theming can be achieved using [CSS Custom properties](https://www.polymer-project.org/1.0/docs/devguide/styling.html#xscope-styling-details) via [app/styles/app-theme.html](https://github.com/PolymerElements/polymer-starter-kit/blob/master/app/styles/app-theme.html). -You can also use `app/styles/main.css` for pure CSS stylesheets (e.g for global styles), however note that Custom properties will not work there under the shim. - -A [Polycast](https://www.youtube.com/watch?v=omASiF85JzI) is also available that walks through theming using Polymer 1.0. - -### Where do I configure routes in my application? - -This can be done via [`app/elements/routing.html`](https://github.com/PolymerElements/polymer-starter-kit/blob/master/app/elements/routing.html). We use Page.js for routing and new routes -can be defined in this import. We then toggle which `<iron-pages>` page to display based on the [selected](https://github.com/PolymerElements/polymer-starter-kit/blob/master/app/index.html#L105) route. - -### Why are we using Page.js rather than a declarative router like `<more-routing>`? - -`<more-routing>` (in our opinion) is good, but lacks imperative hooks for getting full control -over the routing in your application. This is one place where a pure JS router shines. We may -at some point switch back to a declarative router when our hook requirements are tackled. That -said, it should be trivial to switch to `<more-routing>` or another declarative router in your -own local setup. - -### Where can I find the application layouts from your Google I/O 2015 talk? - -App layouts live in a separate repository called [app-layout-templates](https://github.com/PolymerElements/app-layout-templates). -You can select a template and copy over the relevant parts you would like to reuse to Polymer Starter Kit. - -You will probably need to change paths to where your Iron and Paper dependencies can be found to get everything working. -This can be done by adding them to the [`elements.html`](https://github.com/PolymerElements/polymer-starter-kit/blob/master/app/elements/elements.html) import. - -### Something has failed during installation. How do I fix this? - -Our most commonly reported issue is around system permissions for installing Node.js dependencies. -We recommend following the [fixing npm permissions](https://github.com/sindresorhus/guides/blob/master/npm-global-without-sudo.md) -guide to address any messages around administrator permissions being required. If you use `sudo` -to work around these issues, this guide may also be useful for avoiding that. - -If you run into an exception that mentions five optional dependencies failing (or an `EEXIST` error), you -may have run into an npm [bug](https://github.com/npm/npm/issues/6309). We recommend updating to npm 2.11.0+ -to work around this. You can do this by opening a Command Prompt/terminal and running `npm install npm@2.11.0 -g`. If you are on Windows, -Node.js (and npm) may have been installed into `C:\Program Files\`. Updating npm by running `npm install npm@2.11.0 -g` will install npm -into `%AppData%\npm`, but your system will still use the npm version. You can avoid this by deleting your older npm from `C:\Program Files\nodejs` -as described [here](https://github.com/npm/npm/issues/6309#issuecomment-67549380). - -If the issue is to do with a failure somewhere else, you might find that due to a network issue -a dependency failed to correctly install. We recommend running `npm cache clean` and deleting the `node_modules` directory followed by -`npm install` to see if this corrects the problem. If not, please check the [issue tracker](https://github.com/PolymerElements/polymer-starter-kit/issues) in case -there is a workaround or fix already posted. - -### I'm having trouble getting Vulcanize to fully build my project on Windows. Help? - -Some Windows users have run into trouble with the `elements.vulcanized.html` file in their `dist` folder -not being correctly vulcanized. This can happen if your project is in a folder with a name containing a -space. You can work around this issue by ensuring your path doesn't contain one. - -There is also an [in-flight](https://github.com/PolymerElements/polymer-starter-kit/issues/62#issuecomment-108974016) issue -where some are finding they need to disable the `inlineCss` option in our configuration for Vulcanize -to correctly build. We are still investigating this, however for the time-being use the workaround if -you find your builds getting stuck here. - - -### How do I add new JavaScript files to Starter Kit so they're picked up by the build process? - -At the bottom of `app/index.html`, you will find a build block that can be used to include additional -scripts for your app. Build blocks are just normal script tags that are wrapped in a HTML -comment that indicates where to concatenate and minify their final contents to. - -Below, we've added in `script2.js` and `script3.js` to this block. The line -`<!-- build:js scripts/app.js -->` specifies that these scripts will be squashed into `scripts/app.js` -during a build. - -```html -<!-- build:js scripts/app.js --> -<script src="scripts/app.js"></script> -<script src="scripts/script2.js"></script> -<script src="scripts/script3.js"></script> -<!-- endbuild--> -``` - -If you are not using the build-blocks, but still wish for additional files (e.g scripts or stylesheets) to be included in the final `dist` directory, you will need to either copy these files as part of the gulpfile.js build process (see the `copy` task for how to automate this) or manually copy the files. - -### I'm finding the installation/tooling here overwhelming. What should I do? - -Don't worry! We've got your covered. Polymer Starter Kit tries to offer everything you need to build and optimize your apps for production, which is why we include the tooling we do. We realise however that our tooling setup may not be for everyone. - -If you find that you just want the simplest setup possible, we recommend using Polymer Starter Kit light, which is available from the [Releases](https://github.com/PolymerElements/polymer-starter-kit/releases) page. This takes next to no time to setup. - -### If you require more granular configuration of Vulcanize than polybuild provides you an option by: - -1. Copy code below -2. Then replace `gulp.task('vulcanize', function () {...` entire gulp vulcanize task code in `gulpfile.js` - -```javascript -// Vulcanize granular configuration -gulp.task('vulcanize', function () { - var DEST_DIR = 'dist/elements'; - return gulp.src('dist/elements/elements.vulcanized.html') - .pipe($.vulcanize({ - stripComments: true, - inlineCss: true, - inlineScripts: true - })) - .pipe(gulp.dest(DEST_DIR)) - .pipe($.size({title: 'vulcanize'})); -}); -``` - -## Contributing - -Polymer Starter Kit is a new project and is an ongoing effort by the Web Component community. We welcome your bug reports, PRs for improvements, docs and anything you think would improve the experience for other Polymer developers. diff --git a/webapp/app/cache-config.json b/webapp/app/cache-config.json deleted file mode 100644 index c6a8cef..0000000 --- a/webapp/app/cache-config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "README": "This is the cache config for the dev server. The service worker cache is disabled, and it is recommended that you leave this as-is. In the dist environment, this file will be auto-generated based on the contents of your dist/ directory.", - "disabled": true -} diff --git a/webapp/app/elements/elements.html b/webapp/app/elements/elements.html deleted file mode 100644 index c0958ac..0000000 --- a/webapp/app/elements/elements.html +++ /dev/null @@ -1,41 +0,0 @@ -<!-- -@license -Copyright (c) 2015 The Polymer Project Authors. All rights reserved. -This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt -The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt -The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt -Code distributed by Google as part of the polymer project is also -subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt ---> - -<!-- Iron elements --> -<link rel="import" href="../bower_components/iron-flex-layout/classes/iron-flex-layout.html"> -<link rel="import" href="../bower_components/iron-icons/iron-icons.html"> -<link rel="import" href="../bower_components/iron-pages/iron-pages.html"> -<link rel="import" href="../bower_components/iron-selector/iron-selector.html"> -<link rel="import" href="../bower_components/iron-localstorage/iron-localstorage.html"> - -<!-- Paper elements --> -<link rel="import" href="../bower_components/paper-drawer-panel/paper-drawer-panel.html"> -<link rel="import" href="../bower_components/paper-icon-button/paper-icon-button.html"> -<link rel="import" href="../bower_components/paper-item/paper-item.html"> -<link rel="import" href="../bower_components/paper-material/paper-material.html"> -<link rel="import" href="../bower_components/paper-menu/paper-menu.html"> -<link rel="import" href="../bower_components/paper-scroll-header-panel/paper-scroll-header-panel.html"> -<link rel="import" href="../bower_components/paper-styles/paper-styles-classes.html"> -<link rel="import" href="../bower_components/paper-toast/paper-toast.html"> -<link rel="import" href="../bower_components/paper-toolbar/paper-toolbar.html"> - -<!-- Uncomment next block to enable Service Worker Support (2/2) --> -<!-- -<link rel="import" href="../bower_components/platinum-sw/platinum-sw-cache.html"> -<link rel="import" href="../bower_components/platinum-sw/platinum-sw-register.html"> ---> - -<!-- Configure your routes here --> -<link rel="import" href="routing.html"> - -<!-- Add your elements here --> -<link rel="import" href="../styles/app-theme.html"> -<link rel="import" href="../styles/shared-styles.html"> -<link rel="import" href="message-list/message-list.html"> diff --git a/webapp/app/elements/message-list/message-list.html b/webapp/app/elements/message-list/message-list.html deleted file mode 100644 index 8b4a80b..0000000 --- a/webapp/app/elements/message-list/message-list.html +++ /dev/null @@ -1,80 +0,0 @@ -<!-- -@license -Copyright (c) 2015 The Polymer Project Authors. All rights reserved. -This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt -The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt -The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt -Code distributed by Google as part of the polymer project is also -subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt ---> -<link rel="import" href="../../bower_components/polymer/polymer.html"> -<link rel="import" href="../../bower_components/paper-material/paper-material.html"> -<link rel="import" href="../../bower_components/iron-ajax/iron-ajax.html"> - -<dom-module id="message-list"> - <template> - <link rel="import" href="../../styles/app-theme.html"> - <style include="shared-styles"></style> - <style> - .received { - float: right; - font-size: 60%; - } - - .paper-font-body2 { - white-space: pre-wrap; - } - </style> - - <iron-ajax - auto - url="{{getUrl(server, address)}}" - handle-as="json" - last-response="{{broadcasts}}" - debounce-duration="300"></iron-ajax> - <template is="dom-repeat" items="{{broadcasts.messages}}"> - <paper-material elevation="1"> - <h1>{{item.subject}}<span class="received">{{toDate(item.received)}}</span></h1> - - <p class="paper-font-body2">{{item.body}}</p> - </paper-material> - </template> - </template> - - <script> - (function () { - 'use strict'; - - Polymer({ - is: 'message-list', - - properties: { - address: { - type: String, - value: 'BM-2D9QKN4teYRvoq2fyzpiftPh9WP9qggtzh', - notify: true - }, - broadcasts: { - type: Object, - notify: true - }, - server: { - type: String, - value: location.port === 5000 ? 'http://localhost:8080/' : '', - notify: true - } - }, - - toDate: function (timestamp) { - return new Date(timestamp * 1000).toLocaleString(); - }, - getUrl: function (server, address) { - console.log(server + 'read/' + address); - return server + 'read/' + address; - } - }); - })(); - - </script> - -</dom-module> diff --git a/webapp/app/elements/routing.html b/webapp/app/elements/routing.html deleted file mode 100644 index 2d7ff3d..0000000 --- a/webapp/app/elements/routing.html +++ /dev/null @@ -1,46 +0,0 @@ -<!-- -@license -Copyright (c) 2015 The Polymer Project Authors. All rights reserved. -This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt -The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt -The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt -Code distributed by Google as part of the polymer project is also -subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt ---> - -<script src="../bower_components/page/page.js"></script> -<script> - window.addEventListener('WebComponentsReady', function() { - - // We use Page.js for routing. This is a Micro - // client-side router inspired by the Express router - // More info: https://visionmedia.github.io/page.js/ - - // Middleware - function scrollToTop(ctx, next) { - app.scrollPageToTop(); - next(); - } - - // Routes - page('/', scrollToTop, function() { - app.route = 'home'; - }); - - page('/read', scrollToTop, function() { - app.route = 'home'; - }); - - page('/read/:address', scrollToTop, function(data) { - app.route = 'message-list'; - app.params = data.params; - console.log(data); - }); - - // add #! before urls - page({ - hashbang: true - }); - - }); -</script> diff --git a/webapp/app/favicon.ico b/webapp/app/favicon.ico deleted file mode 100644 index 4887394fe9ed8a51168f00595b54dc2ff098ce0e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 611 zcmV-p0-XJcP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o zcW-iQb09-gHt4*vi~s-u-AP12R5*>Llf7$HK@`P*ci!8?)tEqtVkZdE&c-qpfna6j zM?fqD5epl^UONl%53o`&)<P^y3at!Tlr*+RP_S6YYJ?cWChzT=dn|U}eq}oc24<K! zzkAMQ#w77SBP|zZHgNF#wN@n-<U|QD?BulWUAYuq0+fZVyXXTvTh<v4_$rY|Ab~r~ zp4Qgnge_jYVC$tW3|rFW$4?gDEY%7lK|m*=3qs(O;KS!lEgXt)>p`vB*vaOajg32L zt2N_*b;M<x>WzYGB@5BDx>h@QdjIx`M_s_LpL?GQ!uf5hFfCD9r(+@n*!i1M-^<Cf zY%EFAhd>VyUFRag+@S<?bG2bfFeayt5sNBCjJpF7<YY3&ae=o1We?QjAO{P9)PfBF zT*5o0G$O(PsPE}?0o_yYKt>3M#UmX^LRcFxbh&>oF+SJ>m644~mQffKM|yoIO`5}4 z4#1a@5h`X>|NQ30@(b$K<D@RkARt^2lXUyz{Pmk2<2odL0F)HKS~9_WXfoCKLDij> zj9~32JL7Sy(#n_SUM;>q^cUu@u521MyKiP`YZrNrSqhe51Y{w$oU<EmuYGSv9{LM0 xHt)LU-^M&Yu;ge{A!*9A-<g?$-j(A1@ej(I9#m#U1Kt1t002ovPDHLkV1ga81egE- diff --git a/webapp/app/images/touch/apple-touch-icon.png b/webapp/app/images/touch/apple-touch-icon.png deleted file mode 100644 index 243b89959624ee8493479d7c68a724f840f65a53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5314 zcmV;z6g}&SP)<h;3K|Lk000e1NJLTq005W(005W>1^@s67{VYS00006VoOIv00000 z008+zyMF)x010qNS#tmY3labT3lag+-G2N4000McNliru-v<~91s042WB3376i-P+ zK~#9!?VVe!9oJdM|KFO~w{v_szQnos(%N<1Bqb>(EvQXHOallMctL$DFHluH6^SRL zN|lg672*LZ!~+QNhTthGJb<_aP)Vea*lp4%*uklDnu}vQK0Y^}%f8I4kB8Z_&+OTA zpEWaU=ImvSj(xmm_RLzp`G1%7%^G6nT>xzWG~QG-R(LELA209EpySP3fsL41&O3VE zifUpG*Sr-C*u2f#9I$zt12%8-Hq*@gaFLeHxOtm!>n^ap3orvj(J?Ql36DA5XDMtK zVlV@}F7Wh4z%XbInBHIk%O3#C9}-qKfc|I<7o49-Tij=v)xl^>;NT)~;{(F^GYlbU z4w#N@Z3B4a4dCNdpg#npj2`SrhBzHGoE1g}Y}@f$?%Z?!{+YA&hOCi*t*ikr{tvLR z=_rCAXJbDFln^ka00_}}pSXRQ7({?&6Fy!gFf$%KS6|2)=j0EDz<<34tZh1~Ro9!} zfeg62M!5DaU`w6@rbGL|TaI~z&yg=|coZI(nVk)C3bK_o!rL{4tWkh%?Er5tJH885 z!$@w`@}JNQWH!$MtE&CvCNQ#QQxL2xQ9kt|5`m{T1=(`FAZrw0w^yd4G)}-$>`-w@ zY!XF=m|n=PE!W3fHqJzH99Uf6>vJKyw?=sTMm?0QQGm&ma+P~{QXVg9a+eZ7Ru`Xa zf6PU4Mw-epj~SJ0#Z6&o3|X@PlbE)V5nyr6Zy2w+)ETmUS51*v%yLHuxdk)1Pqt3D zrm0WXEWk*Sm1On2#ra>92Qmv-S=Up^ngy6p=YEx~UU_dUU461zOm_3y7U=3t@OyWG zja`r}!Q@j1mavaJ4Xb?!hOHJJt^sde$N%cPjK|Nh7WHI$1GcdP{KFN{e_sQ(`yhL- z=7z>qdklb>!7PF2E<&C-1fxi}GSHMHJ(0(J2l-@IZ!jMJRP~VQ3)ugC1pLLn0=L(J zp%v|GF#}S9^E@Dx5iXVLrQ%qwPo@iGdir43ZvlVwJ>dNnU@&re&AY+3O@6N~tgLey zV_M0o^~tmYjJNv0pZ$|#9vORcba8dboB@k8IkJopCe7Y+lH;a02VEf34lsJ*Rp8co z@InT0pygDps^L;?$aH{AE5LZW5B%GkPMvey$fboXb{1SMTzPyjO8I%6A=692-ue*O z9*oUm3YnN}2;Z^{R*tbqE3`D;iQqsmvwx0r@k3^n2$^1hy>n}}B!W?>$IU6>;sU<k zOM)O^IFhg|&K$SIL00Cpl2(Ax=1%m;vRbHEg@2|%z5FB$hQRiY4MV6+X;fh@^-{2j zdT~5xDS=D03+Eruv~FS8u-si81=i@RcKk!krMJ7JXG`7ln$JaYa&nNv1xvtl8CT{8 z&Mi}5bxmS@V+6B+RJga)Cj>H5<QZ@cCc6uC!dQ)JDKU-i{sfQ!NVM?Iav#=6!Z6hP zfhiz!xzF^qqCSF^(KcqXmBqrvvGF9K)e`6r4gBcpCM-*$)l%QrM9w3At81Y?nHMtQ z1FnXErAbftfs0F1q)1nkty}@&Bmkh>X<=*E#A`oX#hs70(QX5+HeiU^*|V&h5Kh{0 zb)9ha20_YD%bj)&Uj{0g?B<XWA^&P5q=|Scgexi~LPX=|BLRYdB#DJy8-oGi2XAiR zK<^&ToH~S~M;Fj;n-D@MyI{+5*7Ue`gK_RO(CaGcd@cpB8}Hr6l^?C(#_}fatq*1Z zBLG`u;2ZDW#^<FC2xGPrNFS(_!Zjn}4rH#x5EI&M6Gx98#oGENUb%b=trpNW4Y+(c z;yv4^VK?&h^4kO=XJZiBZ3CxIcJMo2dqjy%Dip9gcX#o(FWkVZuiwRJC}G<&^wF~W z5ZKrrg@dFBHdWz*GPpS06{E2Y6Aaiav2^4RdfhfQ*4HtzZNMI{Wg%w|$`KvKOfyis z-!~iqyF2O_C=9SSudd>|fBnB$S?$BJ<fPZaveOI(xl=xra<l?c6~&o%g-~<2in%gF z1h5ofL69ubUFd;?z}Ds_n5A>Q>_0IM{Z5|o_1H5m1VI9=mZ3zw3Ipt&<xPC&yKi7~ z+uG}}G{eE(vQ>?O+%l^RCy9ZvsT2}|1z1XSdp!t2*t)+pF@t;NkRy*D=KYfUQvkv+ z^i{CI(8izs<y+X;vH;4tK9?q-F&D>CGJgyZaC{^-9P%8<3~X<0O;m^{H)wVxCE9a= zwFK<nzkd@Se6;OxG!-!7AK{XK%bhq?LLE&qu;f)WW^}t<2qCbuv$N;AN1QZAl1G!( zkqsgA1Z+68@gFbUf^E-M0tBw?tZL-FwPB<&SSjIRPx@lUc8-77>2y4h0Tfc%8|C!- z3(<tGfW7wmUA%vDE3(5VsRLhuRa8|hTVx39I^%o37tm_8vA9Us-Q5lCV@h$&q%i%i z7O*!~(C=H3mz3CK7Mues!f{s#SL~DEz7A})T3`_RySvDfrFH>U2^i1BtQp(gmEB36 z%e}+GBFI#}87I6Q%Z>yqf-9&=23jo>L<<=7cN1BQu+J1_B02YPQqV<kWSWArn8c8B zVrGD4aS&x<hs(PGm;uu?fNl?ien0XCjsj3+3}q_S!>}MF1~T^!tlPtgy1>N&kWsgb z!C(-6@0R4_nq_r(oXMO%N`;<&1z@Q@7iPdP4Rp}Oa12>h%`D=ANeO5rdiol`rF04k zj;ml80_{!*qv6n*iW~P~+!(1gk%bL{I?zg%g{<FRB3wz2D}+F+-NtA%Oc6>3YDT62 z&@6gTVhy62RKL<hYieFfe10-Z)G7>tHrg1CMv2CRX8-BkjnjB^W?6SWCFy8J>4k<> zfmIe<?(awlnC%v<k(EHeI7}nbjt-k;4;rQILDCGW3RNo;TwXFrz-*bYEGwymQOM84 z#@19mN->P5jt^4_atXpyk!q>(LWu-Svjy9-O1W>%!sLLGbrz}UY4^Dg=)ERup>U;m z{EmoVm?mtyaLA~*r;1WP#iQdJs`P*h3gMc9%y9GUL7T>DiY!va<3AH`zp5fb#UNB! zp%Gg&O9aC(Af;WH><DeuU}{;W5|-EDX2F%*CnE@zC9DAorYtd#Dj7*7jaCJgmldu8 zl=Zqe17uQ4<$WQF=-fmdtWq(e7NKh*Tm|gwKqd+SjEcD5Q-fB+YKlzPTXMvh1+pUN zBB`i5I@6RR)dQ?j<BNje@<K+?v?gCEXkk4@&4NlNxF$-h*vYSCa5Bp<SLeuAQf^&A zutK^5#>|PTSN(%U8k@qRGbAcL#2Q~~G4)^xA)A(EDz})vBB)ft#WlEQv$#RxDaSEg z*DHLCNCTKMLD2xXO7p?eSFa}RPSO^nBH^l2E7i%*4_eqrI7z57W|pc3OZkf+xIuvB zH=p%ttoXxqgR3&Yf?(qY*@YsiW9tZ4A%JBsB;>OF`&y`0o#84rid4l%RA*2Pp{h`| zst9(>GCQA&I(S8s<y_!SO@OQXD6+nmFaN-E3E!a^TuA{-dTNxVzp2SkX#iH$%}jXB zegovKf~7pdwD$$1O(e+`9Hg+<G_&4-`N3fybkoI(JboxR_kzDc>pGIYFlh*u4say_ zjC?S;|CX43#TymwY(@1JJ1=pltT2`}09!-2vM89_L}GmE<ZP8h$$o(=PZUYHdv)K1 zk>x0>Zu79F76V1i1gh-lkTncLO|1s8>eVw@%R|)?tU>^DN@ZA0g+%@muu2Fhd#qXW z<XK@Q(|g$kDt-hjo-#r;U#UG@rI^U3)_zqvwp^o>e<c;Ib%jlbapjuLCz;iCl>Zfd zJO`>_aOo38!uwj_YC=h!$BwzaH<qb4|D5}Cb*@n0idF|w`Mt_tB~#fd<jhm&Q2QW) zoAI5Mz3F4#^zyT6_hfgFd71;KrvqR6C%c1yo5R*@uqt=*xk1i&9a9dqeJ*ltSM>&~ z>~k>nACVN{>l`YT=b|E3OZ+OCd0<#`uri#Fim^`pGOVZ~8fJi)^<J@Xzd=>?Ic0gO z$o=Vk@MG#FH#5_WG>2-xo?9LtOpf8Q;XDK)z}yOw*1D|6+616<JIAzudGQcq$Wpo4 zMX8%}0<>>|QhB~QycC`Q7%Ch=w=<k#ii~etBY>n0!y15T|A17~`5)-1>j<G>e{=lP zP+CRkf7@Eb#vqVo;qdwjY?0{@bGTf^F@R5=f);>zVKPwWs{w<0mw=NW{uq$W04D8y zsHz=4$oR}zp#@+rWCE&RlbV5YZgp_>gX>sYS%=k{gO#;C_9;fYMcM!s<Y`yZY!Wy) z+{MMqFTyg==#+3#>b%&KxcI2rjw{BjmHhaaE1y=UhbMphLtJ?M3U(LJ$a&1-Oh4oK zXMuKGZKsv@&h8-3O)+E)pw;f+*_ZzjBO)wcd<ty~5Tm(bMLYJ4=Pxl%KdfGF%Af2m z05}4`<jAol1P-(eeC7Ku;PUMcaQ$a5VRUQ>#DK8J8IS@mNA-a@!z?gKXNw1yarPAB z*)IUcj}&9fs;{Qt2p^8pgJuA*gn`9w7hih&RXn(S70aJ|3>#<8W3co9WV;I{kr|ER ztgfTMtbkgh(?WZxhoBk-A%Mjm<Kg4L`A-0+9x68Y*SlONMMt~S3StZy6QQ-Rfb;eU zN3LDQ>eb5_m>pP#2{}&JrFq{eh5Uc$=P5a)G(M9kQ%ET=J^Cw8;KJ8`-Pe)ig!}>^ zDlem?e?3?V7RdwK<iZSr<BL5QHn1ZZ3=2}aV#%1EuMY<aIROh@$d)<LG1DmL0b-a& zWtpR90!9I$vFS#b1ROH}g9zJ9j=}{9Ws=p5Mbbf!0*t4>H7j6Y-*0FXJvRn0f2Vub z_!Iyn0mlSjGO)w5(PvV?k}jzo_&N7&a~V`I4PY&eN>&;Nm>)9s_-9POF#=i)?8tC6 z$^w!9Kggqx<RiFfz|7_<7?0O7r(9sDY68KF`!5k-2w=eRi~Um;|H~gfP&%OU0w&N{ z!1gdhsD}~Wq{4Hc5R=K{D07K``vCf$PT+vSiG?j7ui&*%amP#pZY*G2bSgzd6B+dO zjv(kHfK@U|2?E@IA11(H2QrZuE{;vsQiPhQQm@%))bsblz5VTj1w+TUE;^+~n@&jY zM0Ncjpb|ReQR#`ouOldTcHyD9lkaa`NL(=&(I-MTRSGme?u%o{lK5n49sjt1A+!I* z!Jo6cCR#spP8-0q@dw+Gc+XhGznBLBwgW*ZW^>vC0UerMekzZ8QBoC3cRxhVaPTib z31ew-4p>mfEyBQGbsoYx5vnLG^Fmf-dL`5p#!MxR4)@Uh?O)I;Wuy;aMCicA?bZ^$ z)p-y$%gQ069Ey`?-$2oh`7YZan1Aq9t<+1mlnEHX5(6)HPvUnw4`8(-$a(=vM)CJY zZna8k2L1b5M;0Ld<ZEbOJPX~LcA0!8#!)u#a`y~=lT3VLa2vl0MmJa4KWBohhspCK z<=kDKHt<cp2Q}F-fajh->$fh!eBcmtY#L4#IsVrXGH|bZ3f~qB_?y8;_&FZoab_GH z&lGT~)nG-yNK(8y5HNt70H)09HES+C<w87rjDrU{_}ovQ4o;*JF&$X|U3diM=g+eF z&=CPW8*2v`kz<#fhi4gGW^`M}a7Xm;ccXh?9zl$kJLjn-F@oRlOp(Pm!4rd1Nnj$+ zWVrwH5x_-wU>v!x^ZO@1eFA^~htEfOWYTx>Mdoqxm<cv@1fK|C9uF=_EEo&ul7MY( zjPH8C0?>?{#8-EDfuRsMDE9M70Au*0hG@VJiG?U3bZ4J}7Kx;i0gCk`^#jbI%lQEU zvE!Es(FIJvw%5b^n7n%9RW?rSX~&Kb#s6|b!enlc6FfPZC^bWvo>rxt>Xqi5c9ils zq})XMAFIkdZ9+69{H|UZMh`@QZEbq~)2j|aN+iOqNMiMxI+5rkglBOKqA+tDGk%n) zlu@NxQLcz+cK^va7Q2i&=LqNB@f@2#*Dn)B4@3gCy)m9H5i{x#?gLRq^SF0H%rSsb z5`QlmFd<6w+w)du#~xF$g0Xt&T%T%uUobOBbYT#Um5le4Eb=B#;!g!D5hvXz#=%dl zU=3Px+f;iy*vgbHFv6VpGYp~*$UFqwzCSfUu}-=N6i(>EQsNrd=qlGV9zsD*dg+m- zQY}7zZV^U7>ONU!2{d_iGpGw;9CCg)?!UcQKJ4$_METyzpG3kLSq-)$hnur{i&7je zed!S_E|&SYlmt-+hH)@y6qX@Wq{Ir8ta_JXh32tOAFevZpeJCDUpRr!UN}(lCHNsr z;Cm?x!c-OH?47riL;U;~PZnVssrG;Yz*m3m99Zt6+<9~fqBewa0I?6EQ63+w$T1=S zHoo%Z6F75nNu_F4n&DSY!Bd|*iRYd<4(370kg*Rkh02oGJSH^B3*A1x`SquYOhMEi zFaY@dZ+;O^Jlggs8I=fGD_qGaF0GKY7&_0G3xFjITE}<3^$d<5J%A=PVlHO&sljlB zKmPNV@#0H&AjBew%8QJM2vUw9?d`pR4ah-JtY4NedylO7FB?+!@yLS)zWsY&#!o%= zFq+m11I%r&TzL=Q`{(PpdVK@;w;9Z3`I`jh5!l`hRj)*kXi$_1OrUBM@DG;gw1Lwn z7x0VEd;-7m{AbbYwb8^@IACsj?e+KZpD(?O8$Ve?e_)sLco&g?ltVBNJ(>CBWjE3K zL;(w^j5U$MfCmggIPt(Dp8moa{L-ZhSX}6!$xQ`dmAwakpR`)PDA-hV@nIqH{561T zqruwsr>XGbwGEXU3R^9jn2%Xw%qS~9o|5C3^RWr_DQDN$)E}-me=SW_s<-Yx>v_pJ zV8Km>_?SV1rNhG(HUJBI@9+dLSt-=?SSvzs^{M+HiS%5%yPmR0d9CjETL8BHA8v(< U&G>x;Z2$lO07*qoM6N<$g6wSGl>h($ diff --git a/webapp/app/images/touch/chrome-splashscreen-icon-384x384.png b/webapp/app/images/touch/chrome-splashscreen-icon-384x384.png deleted file mode 100644 index 436e9b93ce139bb1eb664a0bf4d7cfefea704d09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11418 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 S%!Pt-psJ*ySgK(D{Qm*A4q;6I diff --git a/webapp/app/images/touch/chrome-touch-icon-192x192.png b/webapp/app/images/touch/chrome-touch-icon-192x192.png deleted file mode 100644 index 6a5e101193d49c85b0c101a5382e9e5a24b593f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6112 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 diff --git a/webapp/app/images/touch/icon-128x128.png b/webapp/app/images/touch/icon-128x128.png deleted file mode 100644 index 43649032799aa6e7d2e4c2facfd43040643f077d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4117 zcmV+w5bE!VP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU>w@E}nRCwC#U0aYGRT=*O?w;Mv?q)X$ z1=%EmB88=52})T|;sc_RaETXEmZeovVrhvlf)A)Xh(4%QA_bI|C6<Cvh+I=v5wZ!O z5aklWRS+Q|0TY%GHz8zq?lawee*4UAduF?5PIsTa?aT?y>`dSP@B6Rk^l2m_7_|Ov z%0L7I0u0)K0E0Flz@YVI)6#tLo2Rp@3>f(=k$MRLp?w_>Z5`s<)-NKlueFU(gxoq- z{SO=+rI}6V4_%c88Dbi<fY<he`ma~b>jBm8l}Z2xvqKB+sJU$;u&)?lsJ5JP5<;n1 z-SUOc4S#+>0Lg87M|owjJiMn+#^X!n?tpf^vjAjpB1HW=0b>l_f1&~_ClL-GDNb+N zFnZA-29T)vxzf;m^LY#WO46>buKjf;5a<TL3CE9Kc;9qkdO!e4?Zw^3rb1CUPdCLh zIC67}?WgA?SiO4ef_t{+w+#p&p;fEuudBKQkV7B|x*V62V9o0B4R=3~-##EffOhY6 zX<b>z)uCcZ;T(rsthH0)>yt==)DVCm^GRLrffsql(huf-;^w51AT<Oi>!4FJzwZHl zl8k{93GUjG+dd$G$7UF0ilRkPBkP3(R!p#N&GN*MAT<OqO>nO3k$-&S${vzLg47Uz z@v>}JA0U8Xf@)q#AwhbAK*q2eu3oVvzw1aY3D(9;f<%>qi$DC!R3=|OtIhNiATRar zJo&7zz4o5dzU*6}N!<MVB0!@bz+?<gIZ=V}aYgt#G8(|aL)nMEx^ZHC)H091H}JN9 zDCVx$FH*|YKa5t5)xg-I3$)BXjGd78Z^229_RCH!sLdTroPXz*?1NF0AXXPJf6cv< z=8jjks>gEo<FUeO$d@fMP^~W|+fud`!wd&}4~X|NmO;qVBEkLH?fpRjOY<jY-r22Y ziyLZy69sqdUJ;=PwO^D3YbVx6NrKo2U_7?_=a?-{)jRVW>P6%p;d#yPdSwY7(e@N7 zVR}dq3jyY?x?@7imwwa&zf;nF1Jf?RQ$S<UGfkBkheSz&SO_qZEuIS{qdPK9B8WKN zF2^AWreBzkh_x<Z!*9H@I3`$s=a$^IB}V`?U-@F2R7DXWhsBFl2do@+KM%I-zpgVW za^igl>!y}(2$KZy!~nX3iV#SP!bCfZL{2BF{fG<hKUZMVg3Yi=5DNjwFnc>}@&`Hz znF4v>)1vPP^LZ<KE$Q;~B}5X$LI9-Bo_p$vDiJw)fUaDj@HKyN0)U`k2Hu{nG{y+Z zaXDd;AVGZrVfz62xjs37U;EGU2gh<6yg8EtnWgqxU?`ac@wfm+0%}X%0T(bPvU2`z zo1lV_Q8k!7s=}Vv-v!e&gOiWiNpRN#`RVjq0P=#YSNreJuJ~41Y6gQ?w*`s<L&L+6 zD=vdw&&|TVH;zKFSOL>8c+X~FOR#qJ_yu=Js1r!<4ZQpZPo7pP8&_I~{g&QQ=)szR z8C>(u9{5lt=j1>g<;sup^heHt=TAFF9=8I3-z(5;%9MZd2SxZYckEp#=JQ~f28@qo zKvS`?i&&6A9eT@&Hl!i!KXB;en{PaOzhAth^#=a*x)+AtIFQ|3uCR+MRTB(@xd@po zA+X+ei6Iyi30g0bWpHr#eezGmvIP8AR;)S>GMOQ$l*_;@C8!#_m$N>~1?`7$30kr3 z@A|*0j+RA%K;}e~1^(VQ=J)4|#u_)^7u#i8NS?*=t57;?WP|TS0*eKpT7NH}oB&l- zp=^<W1Fw+7jfrF}Sj(hppSr0lu@hk5{_K6ZyuQZZqc_lp^bsMB78dw+5<rXV$o(yh zjW4eSiPfsU_#jSQBa6%nG#-SmGr+Pi6e|I^&o2~>jU0RsQ0$&aL_h}eQDh2ot`-rv z_qP5X8(VID7Oh}TZ{JYyPQ2I&kSpj{R4S&!O-n>a5-I$|yA*&GM9vn0e=Zvx1uT`U zSV?!iM{)~=Y?B{YE+t+96ifQIJzIBsg$xCeqiBH-3VzS@t3iTtxdgiITsC$SU2TOV zr3gfTTkqbhm?pK-9&}=HFKZAm@|T{^O9Ef?{39dFYBz2e^7;-UwE(rMo-M_5BY}`5 zCjk`*3Gg_;Zys`ZWCXC%n*>hEq$<H&K%f-j8(%q<HG{v-B8aOc_cOGM>d~-$j7aAq z3;3wPZ#G^v)G`?hV8zoCy9ID7_PDu(g&QaDY93~0Ai>`UCF0P~Fz8SP(`C3s7zvUl zOK|9e2%!c6GE%${!FSu7R||oYz%*sXoZ(vl>H?n_5!`MSqX#}F@S7_*2@v%*5+t4g zB1XMFjhfG+Qu2V89elO{qh)H6G?^KyUDU$TE)>n{Be41;ZKG%lOPZzu84$SpI9vj_ zpe>AVSapEVHjW1T=Fgl2+!cgH0xfKn_oV0%*64#AAS&=%xxT7GZ5S=Fgc3ji>DF|* z0brxZO+)<P+eyHU0ArL;0(en*`%KQ5lpr9SU{5AoilPGVGqzg-CGO6kKtynotPDcP zo-r&8@O_S2<|B-_C6G0gPm>`Wp*jx+lr}-+&u<5jaTwsYlYmJffhJQ>LPSW(<m5>O z-%bJ<L7^6g&``weC#x$!3h+^Zzu+ws+Zp7+od@UwP73Hjz>m9WQ3+N!wsX}IN+<9= zHlUcVUqTQl*3r{?#6M<Dps42*PB8dVEr58BpWpN#IiSZ4exhA~e<DEOU?3{%60}E= z5=3Y%JgxIegdSp|1h|iY8%ddth7xW8+=vj23<*dNmmv7HdO{?Ev5}!QYX+qUcnY{t zQo)yI0epvZ38(=C1}$WNA9idL>5wp~<|Izg1vgGQ_@TuBluV^g74T7IHCmLy#k7L% zVTUw<9|-}RVx`tARwK*`DC8Zb&OR2QE7W3DadMqrBYL0%94M{e%eMfss=F@J##6#f zh3xBzqtK;=F2p4l1;#&DQMzIPN<ZLX-%6Y%ZY>t!6GS^Ah?2|UxcfIE8xP=1x)>iq zVdIjNxAjRM4-kk9T~Hv3CJKxKmju14G296vq>^EYgea7-m?+Zj;C=-?iNMDe1l9>b zk>!d>kb9WmS9M0IB0vzBQZj@fGObU>sNe{*xdHI<&!L5(!#DswHRlO^JU~AXBFX?S zb%R1X2|)wk6Lr3Lf<U)HlsEuB>ho#Il5Db5fH-pb#E%J#cwkRofF9+!HQ5)s6v(jD z9$<~s1*DY>Nh#GveH}{JHzR9GcU|H{iD6AQA2s-<X~3)he(`W>g20xrJEbmQDkk5Z zO|@o+agBVxr~ZDKk^U?|Kmt?8X2CEFP*n|<N()NPe0Kg0fa8+u0%SFAAC51~!`cIT z2H>~$CpdKQ;BVrO0VsU%o9)b(pQ!o0v;!~0E#>Ct9{%I?AKjIVAkfDf-@TH6hY9bU zn}tt2c0Vv?_AT(dRm$brC;s{9my($UP&kB88Uf3h2mS*ed-xupLcZ^S=Vm`Uf9#=0 zADTYpZ-2d{AVs-?4%s?y(>C&Y6E_z2!0ATbGp~3e$j84_tj{-<VR+%xkHgUqoB@@I z6^%D_t4pe`P=EcrSvyufH-G!VnVH|-a>E(BWL~Ehn{a&04aHX}*8hgAec#6_u=16i zaOCBkP_&p)8lQyX*hGCkLBhss*|FCl+t#^l=a!{9?c1Es&}$8Bj^LSF)K!;SBxZ`L zGA*N-3MzDP=D=IK9{HwGkM@s~jz#ivD(Wq4wefwW^~bQ~8|JK#fR*NJ3&6rlxY6aa z*Kgej;JUqiB(wmpJHO8|{O|V1FWVipxKou>I{~^J`O6dlvaJ2>>j;a7tMvjKy@KC1 z{9PPur{9(##1h%2uBw8zps?vl#;hMT>xZ0e{wY6NFH8XbirkJJ5P}h47=aB4;59Y0 zX}P6AwfKOO00qsz+xkTWpbo!|-U07LfDFbn;z7cwV7u=V3w<hNO1B97bEE-Sfh1@@ zk?{7t2p~d`GBcFaTY%0Pz1;|5gk<gPBq)+M;Lss&>x}+GAwc7_I<Z(f&%^BwcKFBJ z3sw#vW*ctA1+GAGA8zXlMuDVVBwO&D{@G5u*Q{<^as+Ur#50*m&}&v8q_UyahOFa_ z0ma_=k8Z%*E`!VB>5BPa9}u7}j{TWcutm|jNJhqDk-$3LD0+|lyA^)|YrF&ho~;&d z`o;6t9bWnbXlb7UzaKdX-i#pi<s=wGpMZHZ|6M^R=l%c3Do1{n&t4H%HWe)a5L+o) zSz7^D4^P2P3ZDd-h9wY9*ZhuUL;-ELx7}uG#|^ps=?}kjQ#CFE#8U^TC)Y4Dv<`j@ z8Td@)Ex42zOrZ*DNKc1k8iy^BH%;~&@KN{mrnSLQrXP8vTD<!9V)6Dk!Ea<g!GfYs zZ<_XY0BYm{jj7}LyYEc10D5H>KFIR$Va93&o!;UWhsK_c^4>(&u^swUbzB5`{g+{? zZabkezj-nE3}4bKPyFiH-@OV6X<8iG&(ki#rtlR|)iJ=46Jf702e0vUwE-X0D(SYB zWUv!7mzp2i0Y(oxj9uy&3&(cWoBDdgDBbq#j-T8ODQK~|0Boz+E1)PtfSHwG=<|T8 zQh(y869{wy2fL`J69L?b0xr~AFkTD$V3%{N3@eb5CgssEe}R()3)*_^YnEXMw4oJX z8Wsu2ZeKgKzeiUOcAEHJ1aP(hEx=p66|3<nifZ-^0TyL=o+9bGB_PC>A}Un31e^r* z34)a_8tq~Q(9M*05TS!8^?O*@MsWfh1>A?K8vSDdSQXGR-@ORoN(x+nr}>~MV#Xpt z-4ZNd*A39_X1&vww}9@n6kYf8(#c!F{vm)BQwM!Be5XaIeJWam1X-7e-rfASJ#^%- z9d@%Gy$B#+0SHQ3{}6!mw*f}hN^>Pm!Pfk*28ucf%*?jN_>o8?kAfY+T?0Vuk^4EX z=N8dQG<T+j0Ks1y$12x``E&@PYLQ@~mM#i`3eW{a!7@UC##rgllUpx8(l-RK+MnwI z8-z@P<<LIX2Lv=av@3FrhltAGffTjC1bBSQrALXXU$>YaAqm_fe-XgE_6v4P8QWYT znC9HJa&h0*G!X!0&E<Q}#ecd|QHF0&waHMmkjS)Rf&wfW^D7*|yQOme{Xa8{7WnyD zX68?QYWw$deMtb`KDF`I3$5ebtSHN-cxuS~wo{5Ig#@h7!2v<=U0sDZ0f>x7Uxrb; z4(pz;t(5j%{oEtJWRS9kvS;%?_mXKe^uuRc$K7asoeIwsFojWBb1~uM3~c?DUCll^ z?YDTis4dyp%$V`$&gt*wA*Bt8meSOXgBC{?FlYk;4BCJIgEk<*prx<<Uw{Ds+cG=m T7aVMd00000NkvXXu0mjf_L-m4 diff --git a/webapp/app/images/touch/ms-icon-144x144.png b/webapp/app/images/touch/ms-icon-144x144.png deleted file mode 100644 index cb9f44ce733f73844e666ddbf78fa61a922c045b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4469 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 Hu0mjf)H+!^ diff --git a/webapp/app/images/touch/ms-touch-icon-144x144-precomposed.png b/webapp/app/images/touch/ms-touch-icon-144x144-precomposed.png deleted file mode 100644 index cb9f44ce733f73844e666ddbf78fa61a922c045b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4469 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 Hu0mjf)H+!^ diff --git a/webapp/app/index.html b/webapp/app/index.html deleted file mode 100644 index 15c5a0a..0000000 --- a/webapp/app/index.html +++ /dev/null @@ -1,145 +0,0 @@ -<!doctype html> -<!-- -@license -Copyright (c) 2015 The Polymer Project Authors. All rights reserved. -This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt -The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt -The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt -Code distributed by Google as part of the polymer project is also -subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt ---> - -<html lang=""> - -<head> - <meta charset="utf-8"> - <meta name="description" content=""> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <meta name="generator" content="Polymer Starter Kit" /> - <title>Bitmessage Broadcasts</title> - <!-- Place favicon.ico in the `app/` directory --> - - <!-- Chrome for Android theme color --> - <meta name="theme-color" content="#FFA000"> - - <!-- Web Application Manifest --> - <link rel="manifest" href="manifest.json"> - - <!-- Tile color for Win8 --> - <meta name="msapplication-TileColor" content="#FFC107"> - - <!-- Add to homescreen for Chrome on Android --> - <meta name="mobile-web-app-capable" content="yes"> - <meta name="application-name" content="PSK"> - <link rel="icon" sizes="192x192" href="images/touch/chrome-touch-icon-192x192.png"> - - <!-- Add to homescreen for Safari on iOS --> - <meta name="apple-mobile-web-app-capable" content="yes"> - <meta name="apple-mobile-web-app-status-bar-style" content="black"> - <meta name="apple-mobile-web-app-title" content="Polymer Starter Kit"> - <link rel="apple-touch-icon" href="images/touch/apple-touch-icon.png"> - - <!-- Tile icon for Win8 (144x144) --> - <meta name="msapplication-TileImage" content="images/touch/ms-touch-icon-144x144-precomposed.png"> - - <!-- build:css styles/main.css --> - <link rel="stylesheet" href="styles/main.css"> - <!-- endbuild--> - - <!-- build:js bower_components/webcomponentsjs/webcomponents-lite.min.js --> - <script src="bower_components/webcomponentsjs/webcomponents-lite.js"></script> - <!-- endbuild --> - - <!-- will be replaced with elements/elements.vulcanized.html --> - <link rel="import" href="elements/elements.html"> - <!-- endreplace--> - - <!-- For shared styles, shared-styles.html import in elements.html --> - <style is="custom-style" include="shared-styles"></style> - -</head> - -<body unresolved class="fullbleed layout vertical"> -<span id="browser-sync-binding"></span> -<template is="dom-bind" id="app"> - - <paper-drawer-panel id="paperDrawerPanel"> - <!-- Drawer Scroll Header Panel --> - <paper-scroll-header-panel drawer fixed> - - <!-- Drawer Toolbar --> - <paper-toolbar id="drawerToolbar"> - <span class="paper-font-title">Menu</span> - </paper-toolbar> - - <!-- Drawer Content --> - <paper-menu class="list" attr-for-selected="data-route" selected="[[route]]"> - <a data-route="home" href="/" on-click="onDataRouteClick"> - <iron-icon icon="home"></iron-icon> - <span>Home</span> - </a> - - <iron-localstorage name="my-broadcasts" - value="{{broadcasts}}" - on-iron-localstorage-load-empty="initializeExamples"></iron-localstorage> - <template is="dom-repeat" items="{{broadcasts}}"> - <a data-route="{{join('message-list/',index)}}" href="{{join('/read/',item.address)}}" on-click="onDataRouteClick"> - <iron-icon icon="mail"></iron-icon> - <span>{{item.alias}}</span> - </a> - </template> - - </paper-menu> - </paper-scroll-header-panel> - - <!-- Main Area --> - <paper-scroll-header-panel main condenses keep-condensed-header> - - <!-- Main Toolbar --> - <paper-toolbar id="mainToolbar" class="tall"> - <paper-icon-button id="paperToggle" icon="menu" paper-drawer-toggle></paper-icon-button> - <span class="flex"></span> - - <!-- Toolbar icons --> - <paper-icon-button icon="refresh"></paper-icon-button> - <paper-icon-button icon="search"></paper-icon-button> - - <!-- Application name --> - <div class="middle middle-container center horizontal layout"> - <div class="app-name">Bitmessage Broadcasts</div> - </div> - - <!-- Application sub title --> - <div class="bottom bottom-container center horizontal layout"> - <div class="bottom-title paper-font-subhead">Please don't abuse.</div> - </div> - - </paper-toolbar> - - <!-- Main Content --> - <div class="content"> - <iron-pages attr-for-selected="data-route" selected="{{route}}"> - - <section data-route="home"> - <paper-material elevation="1"> - <h1>Welcome.</h1> - </paper-material> - </section> - - <section data-route="message-list"> - <message-list address="{{params.address}}"></message-list> - </section> - - </iron-pages> - </div> - </paper-scroll-header-panel> - </paper-drawer-panel> - -</template> - -<!-- build:js scripts/app.js --> -<script src="scripts/app.js"></script> -<!-- endbuild--> -</body> - -</html> diff --git a/webapp/app/manifest.json b/webapp/app/manifest.json deleted file mode 100644 index 9ce7804..0000000 --- a/webapp/app/manifest.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": "Polymer Starter Kit", - "short_name": "Polymer Starter Kit", - "icons": [{ - "src": "images/touch/icon-128x128.png", - "sizes": "128x128", - "type": "image/png" - }, { - "src": "images/touch/apple-touch-icon.png", - "sizes": "152x152", - "type": "image/png" - }, { - "src": "images/touch/ms-touch-icon-144x144-precomposed.png", - "sizes": "144x144", - "type": "image/png" - }, { - "src": "images/touch/chrome-touch-icon-192x192.png", - "sizes": "192x192", - "type": "image/png" - },{ - "src": "images/touch/chrome-splashscreen-icon-384x384.png", - "sizes": "384x384", - "type": "image/png" - }], - "start_url": "/?homescreen=1", - "background_color": "#FFC107", - "display": "standalone", - "theme_color": "#FFA000" -} diff --git a/webapp/app/robots.txt b/webapp/app/robots.txt deleted file mode 100644 index 5a2d9d7..0000000 --- a/webapp/app/robots.txt +++ /dev/null @@ -1,4 +0,0 @@ -# www.robotstxt.org - -User-agent: * -Disallow: diff --git a/webapp/app/scripts/app.js b/webapp/app/scripts/app.js deleted file mode 100644 index e787489..0000000 --- a/webapp/app/scripts/app.js +++ /dev/null @@ -1,104 +0,0 @@ -/* -Copyright (c) 2015 The Polymer Project Authors. All rights reserved. -This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt -The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt -The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt -Code distributed by Google as part of the polymer project is also -subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt -*/ - -(function(document) { - 'use strict'; - - // Grab a reference to our auto-binding template - // and give it some initial binding values - // Learn more about auto-binding templates at http://goo.gl/Dx1u2g - var app = document.querySelector('#app'); - - app.join = function() { - var result = ''; - for (var index = 0; index < arguments.length; index++) { - result += arguments[index]; - } - return result; - }; - - app.displayInstalledToast = function() { - // Check to make sure caching is actually enabled—it won't be in the dev environment. - if (!document.querySelector('platinum-sw-cache').disabled) { - document.querySelector('#caching-complete').show(); - } - }; - - // Listen for template bound event to know when bindings - // have resolved and content has been stamped to the page - app.addEventListener('dom-change', function() { - console.log('Our app is ready to rock!'); - }); - - // See https://github.com/Polymer/polymer/issues/1381 - window.addEventListener('WebComponentsReady', function() { - // imports are loaded and elements have been registered - }); - - // Main area's paper-scroll-header-panel custom condensing transformation of - // the appName in the middle-container and the bottom title in the bottom-container. - // The appName is moved to top and shrunk on condensing. The bottom sub title - // is shrunk to nothing on condensing. - addEventListener('paper-header-transform', function(e) { - var appName = document.querySelector('#mainToolbar .app-name'); - var middleContainer = document.querySelector('#mainToolbar .middle-container'); - var bottomContainer = document.querySelector('#mainToolbar .bottom-container'); - var detail = e.detail; - var heightDiff = detail.height - detail.condensedHeight; - var yRatio = Math.min(1, detail.y / heightDiff); - var maxMiddleScale = 0.50; // appName max size when condensed. The smaller the number the smaller the condensed size. - var scaleMiddle = Math.max(maxMiddleScale, (heightDiff - detail.y) / (heightDiff / (1-maxMiddleScale)) + maxMiddleScale); - var scaleBottom = 1 - yRatio; - - // Move/translate middleContainer - Polymer.Base.transform('translate3d(0,' + yRatio * 100 + '%,0)', middleContainer); - - // Scale bottomContainer and bottom sub title to nothing and back - Polymer.Base.transform('scale(' + scaleBottom + ') translateZ(0)', bottomContainer); - - // Scale middleContainer appName - Polymer.Base.transform('scale(' + scaleMiddle + ') translateZ(0)', appName); - }); - - // Close drawer after menu item is selected if drawerPanel is narrow - app.onDataRouteClick = function() { - var drawerPanel = document.querySelector('#paperDrawerPanel'); - if (drawerPanel.narrow) { - drawerPanel.closeDrawer(); - } - }; - - // Scroll page to top and expand header - app.scrollPageToTop = function() { - document.getElementById('mainContainer').scrollTop = 0; - }; - - app.initializeExamples = function() { - this.value = [ - { - alias: 'General', - address: 'BM-2cToDNkgW4KN92vuEjgnT1To3WEyt4r3DK' - }, - { - alias: 'DevTalk', - address: 'BM-2D9QKN4teYRvoq2fyzpiftPh9WP9qggtzh' - }, - { - alias: 'Timeservice', - address: 'BM-BcbRqcFFSQUUmXFKsPJgVQPSiFA3Xash' - }, - { - alias: 'Q\'s Aktivlist', - address: 'BM-GtT7NLCCAu3HrT7dNTUTY9iDns92Z2ND' - } - ]; - console.log(this.value); - }; - -})(document); diff --git a/webapp/app/styles/app-theme.html b/webapp/app/styles/app-theme.html deleted file mode 100644 index 89169e4..0000000 --- a/webapp/app/styles/app-theme.html +++ /dev/null @@ -1,170 +0,0 @@ -<!-- Palette generated by Material Palette - materialpalette.com/amber/blue-grey --> -<!-- Replace the one that comes in their starter kit --> -<!-- -@license -Copyright (c) 2015 The Polymer Project Authors. All rights reserved. -This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt -The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt -The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt -Code distributed by Google as part of the polymer project is also -subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt ---> - -<style is="custom-style"> - - /* - Polymer includes a shim for CSS Custom Properties that we can use for application theming. - Below, you'll find the default palette for the Polymer Starter Kit layout. Feel free to play - with changing the colors used or generate your own palette of colours at MaterialPalette.com. - - See https://www.polymer-project.org/1.0/docs/devguide/styling.html#xscope-styling-details - for further information on custom CSS properties. - */ - - /* Application theme */ - - :root { - --dark-primary-color: #FFA000; - --default-primary-color: #FFC107; - --light-primary-color: #FFECB3; - --text-primary-color: #FFFFFF; - --accent-color: #607D8B; - --primary-background-color: #FFECB3; - --primary-text-color: #212121; - --secondary-text-color: #727272; - --disabled-text-color: #BDBDBD; - --divider-color: #B6B6B6; - - - /* Components */ - - /* paper-drawer-panel */ - --drawer-menu-color: #ffffff; - --drawer-border-color: 1px solid #ccc; - --drawer-toolbar-border-color: 1px solid rgba(0, 0, 0, 0.22); - - /* paper-menu */ - --paper-menu-background-color: #fff; - --menu-link-color: #111111; - - /* paper-input */ - --paper-input-container-color: rgba(255, 255, 255, 0.64); - --paper-input-container-focus-color: rgba(255, 255, 255, 1); - --paper-input-container-input-color: #fff; - } - - /* General styles */ - - #drawerToolbar { - color: var(--secondary-text-color); - background-color: var(--drawer-menu-color); - border-bottom: var(--drawer-toolbar-border-color); - } - - paper-scroll-header-panel { - height: 100%; - } - - paper-menu iron-icon { - margin-right: 33px; - opacity: 0.54; - } - - .paper-menu > .iron-selected { - color: var(--default-primary-color); - } - - paper-menu a { - text-decoration: none; - color: var(--menu-link-color); - display: -ms-flexbox; - display: -webkit-flex; - display: flex; - -ms-flex-direction: row; - -webkit-flex-direction: row; - flex-direction: row; - -ms-flex-align: center; - -webkit-align-items: center; - align-items: center; - font-family: 'Roboto', 'Noto', sans-serif; - -webkit-font-smoothing: antialiased; - text-rendering: optimizeLegibility; - font-size: 14px; - font-weight: 400; - line-height: 24px; - min-height: 48px; - padding: 0 16px; - } - - paper-toolbar.tall .app-name { - font-size: 40px; - font-weight: 300; - /* Required for main area's paper-scroll-header-panel custom condensing transformation */ - -webkit-transform-origin: left center; - transform-origin: left center; - } - - #mainToolbar .middle-container { - height: 100%; - margin-left: 48px; - } - - #mainToolbar:not(.tall) .middle { - font-size: 18px; - padding-bottom: 0; - } - - #mainToolbar .bottom { - margin-left: 48px; - /* Required for main area's paper-scroll-header-panel custom condensing transformation */ - -webkit-transform-origin: left center; - transform-origin: left center; - } - - /* Height of the scroll area */ - .content { - height: 900px; - } - - /* Material Design Adaptive Breakpoints */ - /* - Below you'll find CSS media queries based on the breakpoint guidance - published by the Material Design team. You can choose to use, customise - or remove these breakpoints based on your needs. - - http://www.google.com/design/spec/layout/adaptive-ui.html#adaptive-ui-breakpoints - */ - - /* mobile-small */ - @media all and (min-width: 0) and (max-width: 360px) and (orientation: portrait) { } - /* mobile-large */ - @media all and (min-width: 361px) and (orientation: portrait) { } - /* mobile-small-landscape */ - @media all and (min-width: 0) and (max-width: 480px) and (orientation: landscape) { } - /* mobile-large-landscape */ - @media all and (min-width: 481px) and (orientation: landscape) { } - /* tablet-small-landscape */ - @media all and (min-width: 600px) and (max-width: 960px) and (orientation: landscape) { } - /* tablet-large-landscape */ - @media all and (min-width: 961px) and (orientation: landscape) { } - /* tablet-small */ - @media all and (min-width: 600px) and (orientation: portrait) { } - /* tablet-large */ - @media all and (min-width: 601px) and (max-width: 840px) and (orientation : portrait) { } - /* desktop-x-small-landscape */ - @media all and (min-width: 0) and (max-width: 480px) and (orientation: landscape) { } - /* desktop-x-small */ - @media all and (min-width: 0) and (max-width: 480px) and (max-aspect-ratio: 4/3) { } - /* desktop-small-landscape */ - @media all and (min-width: 481px) and (max-width: 840px) and (orientation: landscape) { } - /* desktop-small */ - @media all and (min-width: 481px) and (max-width: 840px) and (max-aspect-ratio: 4/3) { } - /* desktop-medium-landscape */ - @media all and (min-width: 841px) and (max-width: 1280px) and (orientation: landscape) { } - /* desktop-medium */ - @media all and (min-width: 841px) and (max-width: 1280px) and (max-aspect-ratio: 4/3) { } - /* desktop-large */ - @media all and (min-width: 1281px) and (max-width: 1600px) { } - /* desktop-xlarge */ - @media all and (min-width: 1601px) and (max-width: 1920px) { } -</style> diff --git a/webapp/app/styles/main.css b/webapp/app/styles/main.css deleted file mode 100644 index 1c9ea79..0000000 --- a/webapp/app/styles/main.css +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright (c) 2015 The Polymer Project Authors. All rights reserved. -This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt -The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt -The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt -Code distributed by Google as part of the polymer project is also -subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt -*/ - -body { - background: #fafafa; - font-family: 'Roboto', 'Helvetica Neue', Helvetica, Arial, sans-serif; - color: #333; -} diff --git a/webapp/app/styles/shared-styles.html b/webapp/app/styles/shared-styles.html deleted file mode 100644 index 73c36ed..0000000 --- a/webapp/app/styles/shared-styles.html +++ /dev/null @@ -1,76 +0,0 @@ -<!-- shared styles for all elements and index.html --> -<dom-module id="shared-styles"> - <template> - <style> - .page-title { - @apply(--paper-font-display2); - } - - @media (max-width: 600px) { - .page-title { - font-size: 24px!important; - } - } - - paper-material { - border-radius: 2px; - height: 100%; - padding: 16px 0 16px 0; - width: calc(98.66% - 16px); - margin: 16px auto; - background: white; - } - - /* Breakpoints */ - - /* Small */ - @media (max-width: 600px) { - - paper-material { - --menu-container-display: none; - width: calc(97.33% - 32px); - padding-left: 16px; - padding-right: 16px; - } - - paper-toolbar.tall .app-name { - font-size: 24px; - font-weight: 400; - } - - #drawer .paper-toolbar { - margin-left: 16px; - } - - #overlay { - min-width: 360px; - } - - .bg { - background: white; - } - - } - - /* Tablet+ */ - @media (min-width: 601px) { - - paper-material { - width: calc(98% - 46px); - margin-bottom: 32px; - padding-left: 30px; - padding-right: 30px; - } - - #drawer.paper-drawer-panel > [drawer] { - border-right: 1px solid rgba(0, 0, 0, 0.14); - } - - iron-pages { - padding: 48px 62px; - } - - } - </style> - </template> -</dom-module> diff --git a/webapp/app/sw-import.js b/webapp/app/sw-import.js deleted file mode 100644 index cb7fb1f..0000000 --- a/webapp/app/sw-import.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Copyright (c) 2015 The Polymer Project Authors. All rights reserved. -This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt -The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt -The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt -Code distributed by Google as part of the polymer project is also -subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt -*/ - -importScripts('bower_components/platinum-sw/service-worker.js'); diff --git a/webapp/bower.json b/webapp/bower.json deleted file mode 100644 index d888a81..0000000 --- a/webapp/bower.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "polymer-starter-kit", - "private": true, - "dependencies": { - "polymer": "Polymer/polymer#^1.1.0", - "iron-elements": "PolymerElements/iron-elements#^1.0.0", - "paper-elements": "PolymerElements/paper-elements#^1.0.1", - "platinum-elements": "PolymerElements/platinum-elements#^1.1.0", - "neon-elements": "PolymerElements/neon-elements#^1.0.0", - "page": "visionmedia/page.js#~1.6.3" - }, - "devDependencies": { - "web-component-tester": "*", - "test-fixture": "PolymerElements/test-fixture#^1.0.0" - } -} diff --git a/webapp/build.gradle b/webapp/build.gradle deleted file mode 100644 index a873005..0000000 --- a/webapp/build.gradle +++ /dev/null @@ -1,14 +0,0 @@ -plugins { - id "com.moowork.gulp" version "0.11" -} - -// makes sure on each build that gulp is installed -gulp_default.dependsOn 'installGulp' - -// processes your package.json before running gulp build -gulp_default.dependsOn 'npmInstall' - -// runs "gulp build" as part of your gradle build -task build { - dependsOn gulp_default -} diff --git a/webapp/gulpfile.js b/webapp/gulpfile.js deleted file mode 100644 index 849968c..0000000 --- a/webapp/gulpfile.js +++ /dev/null @@ -1,280 +0,0 @@ -/* -Copyright (c) 2015 The Polymer Project Authors. All rights reserved. -This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt -The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt -The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt -Code distributed by Google as part of the polymer project is also -subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt -*/ - -'use strict'; - -// Include Gulp & tools we'll use -var gulp = require('gulp'); -var $ = require('gulp-load-plugins')(); -var del = require('del'); -var runSequence = require('run-sequence'); -var browserSync = require('browser-sync'); -var reload = browserSync.reload; -var merge = require('merge-stream'); -var path = require('path'); -var fs = require('fs'); -var glob = require('glob'); -var historyApiFallback = require('connect-history-api-fallback'); -var packageJson = require('./package.json'); -var crypto = require('crypto'); -var polybuild = require('polybuild'); - -var AUTOPREFIXER_BROWSERS = [ - 'ie >= 10', - 'ie_mob >= 10', - 'ff >= 30', - 'chrome >= 34', - 'safari >= 7', - 'opera >= 23', - 'ios >= 7', - 'android >= 4.4', - 'bb >= 10' -]; - -var styleTask = function (stylesPath, srcs) { - return gulp.src(srcs.map(function(src) { - return path.join('app', stylesPath, src); - })) - .pipe($.changed(stylesPath, {extension: '.css'})) - .pipe($.autoprefixer(AUTOPREFIXER_BROWSERS)) - .pipe(gulp.dest('.tmp/' + stylesPath)) - .pipe($.cssmin()) - .pipe(gulp.dest('../src/main/resources/static/' + stylesPath)) - .pipe($.size({title: stylesPath})); -}; - -// Compile and automatically prefix stylesheets -gulp.task('styles', function () { - return styleTask('styles', ['**/*.css']); -}); - -gulp.task('elements', function () { - return styleTask('elements', ['**/*.css']); -}); - -// Lint JavaScript -gulp.task('jshint', function () { - return gulp.src([ - 'app/scripts/**/*.js', - 'app/elements/**/*.js', - 'app/elements/**/*.html', - 'gulpfile.js' - ]) - .pipe(reload({stream: true, once: true})) - .pipe($.jshint.extract()) // Extract JS from .html files - .pipe($.jshint()) - .pipe($.jshint.reporter('jshint-stylish')) - .pipe($.if(!browserSync.active, $.jshint.reporter('fail'))); -}); - -// Optimize images -gulp.task('images', function () { - return gulp.src('app/images/**/*') - .pipe($.cache($.imagemin({ - progressive: true, - interlaced: true - }))) - .pipe(gulp.dest('dist/images')) - .pipe($.size({title: 'images'})); -}); - -// Copy all files at the root level (app) -gulp.task('copy', function () { - var app = gulp.src([ - 'app/*', - '!app/test', - '!app/cache-config.json' - ], { - dot: true - }).pipe(gulp.dest('dist')); - - var bower = gulp.src([ - 'bower_components/**/*' - ]).pipe(gulp.dest('dist/bower_components')); - - var elements = gulp.src(['app/elements/**/*.html']) - .pipe(gulp.dest('dist/elements')); - - var swBootstrap = gulp.src(['bower_components/platinum-sw/bootstrap/*.js']) - .pipe(gulp.dest('dist/elements/bootstrap')); - - var swToolbox = gulp.src(['bower_components/sw-toolbox/*.js']) - .pipe(gulp.dest('dist/sw-toolbox')); - - var vulcanized = gulp.src(['app/elements/elements.html']) - .pipe($.rename('elements.vulcanized.html')) - .pipe(gulp.dest('dist/elements')); - - return merge(app, bower, elements, vulcanized, swBootstrap, swToolbox) - .pipe($.size({title: 'copy'})); -}); - -// Copy web fonts to dist -gulp.task('fonts', function () { - return gulp.src(['app/fonts/**']) - .pipe(gulp.dest('dist/fonts')) - .pipe($.size({title: 'fonts'})); -}); - -// Scan your HTML for assets & optimize them -gulp.task('html', function () { - var assets = $.useref.assets({searchPath: ['.tmp', 'app', 'dist']}); - - return gulp.src(['app/**/*.html', '!app/{elements,test}/**/*.html']) - // Replace path for vulcanized assets - .pipe($.if('*.html', $.replace('elements/elements.html', 'elements/elements.vulcanized.html'))) - .pipe(assets) - // Concatenate and minify JavaScript - .pipe($.if('*.js', $.uglify({preserveComments: 'some'}))) - // Concatenate and minify styles - // In case you are still using useref build blocks - .pipe($.if('*.css', $.cssmin())) - .pipe(assets.restore()) - .pipe($.useref()) - // Minify any HTML - .pipe($.if('*.html', $.minifyHtml({ - quotes: true, - empty: true, - spare: true - }))) - // Output files - .pipe(gulp.dest('dist')) - .pipe($.size({title: 'html'})); -}); - -// Polybuild will take care of inlining HTML imports, -// scripts and CSS for you. -gulp.task('vulcanize', function () { - return gulp.src('dist/index.html') - .pipe(polybuild({maximumCrush: true})) - .pipe(gulp.dest('dist/')); -}); - -// If you require more granular configuration of Vulcanize -// than polybuild provides, follow instructions from readme at: -// https://github.com/PolymerElements/polymer-starter-kit/#if-you-require-more-granular-configuration-of-vulcanize-than-polybuild-provides-you-an-option-by - -// Rename Polybuild's index.build.html to index.html -gulp.task('rename-index', function () { - gulp.src('dist/index.build.html') - .pipe($.rename('index.html')) - .pipe(gulp.dest('dist/')); - return del(['dist/index.build.html']); -}); - -// Generate config data for the <sw-precache-cache> element. -// This include a list of files that should be precached, as well as a (hopefully unique) cache -// id that ensure that multiple PSK projects don't share the same Cache Storage. -// This task does not run by default, but if you are interested in using service worker caching -// in your project, please enable it within the 'default' task. -// See https://github.com/PolymerElements/polymer-starter-kit#enable-service-worker-support -// for more context. -gulp.task('cache-config', function (callback) { - var dir = 'dist'; - var config = { - cacheId: packageJson.name || path.basename(__dirname), - disabled: false - }; - - glob('{elements,scripts,styles}/**/*.*', {cwd: dir}, function(error, files) { - if (error) { - callback(error); - } else { - files.push('index.html', './', 'bower_components/webcomponentsjs/webcomponents-lite.min.js'); - config.precache = files; - - var md5 = crypto.createHash('md5'); - md5.update(JSON.stringify(config.precache)); - config.precacheFingerprint = md5.digest('hex'); - - var configPath = path.join(dir, 'cache-config.json'); - fs.writeFile(configPath, JSON.stringify(config), callback); - } - }); -}); - -// Clean output directory -gulp.task('clean', function (cb) { - del(['.tmp', 'dist'], cb); -}); - -// Watch files for changes & reload -gulp.task('serve', ['styles', 'elements', 'images'], function () { - browserSync({ - port: 5000, - notify: false, - logPrefix: 'PSK', - snippetOptions: { - rule: { - match: '<span id="browser-sync-binding"></span>', - fn: function (snippet) { - return snippet; - } - } - }, - // Run as an https by uncommenting 'https: true' - // Note: this uses an unsigned certificate which on first access - // will present a certificate warning in the browser. - // https: true, - server: { - baseDir: ['.tmp', 'app'], - middleware: [ historyApiFallback() ], - routes: { - '/bower_components': 'bower_components' - } - } - }); - - gulp.watch(['app/**/*.html'], reload); - gulp.watch(['app/styles/**/*.css'], ['styles', reload]); - gulp.watch(['app/elements/**/*.css'], ['elements', reload]); - gulp.watch(['app/{scripts,elements}/**/{*.js,*.html}'], ['jshint']); - gulp.watch(['app/images/**/*'], reload); -}); - -// Build and serve the output from the dist build -gulp.task('serve:dist', ['default'], function () { - browserSync({ - port: 5001, - notify: false, - logPrefix: 'PSK', - snippetOptions: { - rule: { - match: '<span id="browser-sync-binding"></span>', - fn: function (snippet) { - return snippet; - } - } - }, - // Run as an https by uncommenting 'https: true' - // Note: this uses an unsigned certificate which on first access - // will present a certificate warning in the browser. - // https: true, - server: 'dist', - middleware: [ historyApiFallback() ] - }); -}); - -// Build production files, the default task -gulp.task('default', ['clean'], function (cb) { - // Uncomment 'cache-config' after 'rename-index' if you are going to use service workers. - runSequence( - ['copy', 'styles'], - 'elements', - ['jshint', 'images', 'fonts', 'html'], - 'vulcanize','rename-index', // 'cache-config', - cb); -}); - -// Load tasks for web-component-tester -// Adds tasks for `gulp test:local` and `gulp test:remote` -require('web-component-tester').gulp.init(gulp); - -// Load custom tasks from the `tasks` directory -try { require('require-dir')('tasks'); } catch (err) {} diff --git a/webapp/package.json b/webapp/package.json deleted file mode 100644 index e7d0d15..0000000 --- a/webapp/package.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "private": true, - "devDependencies": { - "browser-sync": "^2.7.7", - "connect-history-api-fallback": "^1.1.0", - "del": "^1.1.1", - "glob": "^5.0.6", - "gulp": "^3.8.5", - "gulp-autoprefixer": "^2.1.0", - "gulp-cache": "^0.2.8", - "gulp-changed": "^1.0.0", - "gulp-cssmin": "^0.1.7", - "gulp-if": "^1.2.1", - "gulp-imagemin": "^2.2.1", - "gulp-jshint": "^1.6.3", - "gulp-load-plugins": "^0.10.0", - "gulp-minify-html": "^1.0.2", - "gulp-rename": "^1.2.0", - "gulp-replace": "^0.5.3", - "gulp-size": "^1.0.0", - "gulp-uglify": "^1.2.0", - "gulp-useref": "^1.1.2", - "gulp-vulcanize": "^6.0.0", - "jshint-stylish": "^2.0.0", - "merge-stream": "^0.1.7", - "polybuild": "^1.0.5", - "require-dir": "^0.3.0", - "run-sequence": "^1.0.2", - "vulcanize": ">= 1.4.2", - "web-component-tester": "^3.1.3" - }, - "scripts": { - "test": "gulp test:local", - "start": "gulp serve" - }, - "engines": { - "node": ">=0.10.0" - } -} diff --git a/webapp/styles/main.css b/webapp/styles/main.css deleted file mode 100644 index 1c9ea79..0000000 --- a/webapp/styles/main.css +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright (c) 2015 The Polymer Project Authors. All rights reserved. -This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt -The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt -The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt -Code distributed by Google as part of the polymer project is also -subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt -*/ - -body { - background: #fafafa; - font-family: 'Roboto', 'Helvetica Neue', Helvetica, Arial, sans-serif; - color: #333; -} diff --git a/webapp/wct.conf.json b/webapp/wct.conf.json deleted file mode 100644 index 0ee5739..0000000 --- a/webapp/wct.conf.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "suites": ["app/test"], - "webserver": { - "pathMappings": [ - {"/components/polymer-starter-kit/app/bower_components": "bower_components"} - ] - } -}