digsig / digsig-services

Go to a project
Toggle navigation Toggle navigation pinning
Stefan Huber
ac96d074 1 parent 1b4bc4a4

new rel

Expand all
Inline Side-by-side
Showing 9 changed files with 25 additions and 49 deletions
......@@ -16,6 +16,12 @@ var repository_2 = require("./services/repository");
exports.Repository = repository_2.Repository;
var device_2 = require("./services/device");
exports.Device = device_2.Device;
function provideRest(http) {
return new rest_1.Rest(http);
}
function provideRepository(rest) {
return new repository_1.Repository(rest, new device_1.Device);
}
var DigsigServicesModule = DigsigServicesModule_1 = (function () {
function DigsigServicesModule() {
}
......@@ -23,9 +29,8 @@ var DigsigServicesModule = DigsigServicesModule_1 = (function () {
return {
ngModule: DigsigServicesModule_1,
providers: [
rest_1.Rest,
repository_1.Repository,
device_1.Device
{ provide: rest_1.Rest, useFactory: provideRest, deps: [http_1.Http] },
{ provide: repository_1.Repository, useFactory: provideRepository, deps: [rest_1.Rest] }
]
};
};
......
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;AAAA,sCAA2C;AAC3C,sCAA8D;AAC9D,wCAAuC;AACvC,oDAAmD;AACnD,4CAA2C;AAE3C,wCAAuC;AAA9B,sBAAA,IAAI,CAAA;AACb,oDAAmD;AAA1C,kCAAA,UAAU,CAAA;AACnB,4CAA2C;AAAlC,0BAAA,MAAM,CAAA;AAOf,IAAa,oBAAoB;IAAjC;IAWA,CAAC;IAVQ,4BAAO,GAAd;QACE,MAAM,CAAC;YACL,QAAQ,EAAE,sBAAoB;YAC9B,SAAS,EAAE;gBACT,WAAI;gBACJ,uBAAU;gBACV,eAAM;aACP;SACF,CAAA;IACH,CAAC;IACH,2BAAC;AAAD,CAAC,AAXD,IAWC;AAXY,oBAAoB;IALhC,eAAQ,CAAC;QACN,OAAO,EAAG;YACN,iBAAU;SACb;KACJ,CAAC;GACW,oBAAoB,CAWhC;AAXY,oDAAoB"}
\ No newline at end of file
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;AAAA,sCAAiD;AACjD,sCAA8D;AAC9D,wCAAuC;AACvC,oDAAmD;AACnD,4CAA2C;AAE3C,wCAAuC;AAA9B,sBAAA,IAAI,CAAA;AACb,oDAAmD;AAA1C,kCAAA,UAAU,CAAA;AACnB,4CAA2C;AAAlC,0BAAA,MAAM,CAAA;AAEf,qBAAqB,IAAS;IAC1B,MAAM,CAAC,IAAI,WAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,2BAA2B,IAAS;IAChC,MAAM,CAAC,IAAI,uBAAU,CAAC,IAAI,EAAE,IAAI,eAAM,CAAC,CAAC;AAC5C,CAAC;AAOD,IAAa,oBAAoB;IAAjC;IAUA,CAAC;IATQ,4BAAO,GAAd;QACE,MAAM,CAAC;YACL,QAAQ,EAAE,sBAAoB;YAC9B,SAAS,EAAE;gBACT,EAAE,OAAO,EAAE,WAAI,EAAE,UAAU,EAAC,WAAW,EAAE,IAAI,EAAC,CAAC,WAAI,CAAC,EAAE;gBACtD,EAAE,OAAO,EAAE,uBAAU,EAAE,UAAU,EAAC,iBAAiB,EAAE,IAAI,EAAC,CAAC,WAAI,CAAC,EAAE;aACnE;SACF,CAAA;IACH,CAAC;IACH,2BAAC;AAAD,CAAC,AAVD,IAUC;AAVY,oBAAoB;IALhC,eAAQ,CAAC;QACN,OAAO,EAAG;YACN,iBAAU;SACb;KACJ,CAAC;GACW,oBAAoB,CAUhC;AAVY,oDAAoB"}
\ No newline at end of file
......
"use strict";
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
return c > 3 && r && Object.defineProperty(target, key, r), r;
};
var __metadata = (this && this.__metadata) || function (k, v) {
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
};
var core_1 = require("@angular/core");
var rest_1 = require("./rest");
var device_1 = require("./device");
var Repository = (function () {
function Repository(rest, device) {
this.rest = rest;
......@@ -202,10 +190,5 @@ var Repository = (function () {
};
return Repository;
}());
Repository = __decorate([
core_1.Injectable(),
__metadata("design:paramtypes", [rest_1.Rest,
device_1.Device])
], Repository);
exports.Repository = Repository;
//# sourceMappingURL=repository.js.map
\ No newline at end of file
......
This diff is collapsed. Click to expand it.
"use strict";
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
return c > 3 && r && Object.defineProperty(target, key, r), r;
};
var __metadata = (this && this.__metadata) || function (k, v) {
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
};
var core_1 = require("@angular/core");
var http_1 = require("@angular/http");
require("rxjs/add/operator/timeout");
exports.ERROR_CODE_UNAUTHORIZED = "unauthorized";
exports.ERROR_CODE_NOT_FOUND = "not-found";
exports.ERROR_CODE_SERVER_ERROR = "server-error";
var Rest = Rest_1 = (function () {
var Rest = (function () {
function Rest(http) {
this.http = http;
}
......@@ -54,7 +44,7 @@ var Rest = Rest_1 = (function () {
var headers = new http_1.Headers();
headers.append('Content-Type', 'application/x-www-form-urlencoded');
deviceInfo.code = registerCode;
_this.http.post(Rest_1.serviceUrl + "/config/register", _this.prepareDeviceInfo(deviceInfo), { headers: headers }).subscribe(function (response) {
_this.http.post(Rest.serviceUrl + "/config/register", _this.prepareDeviceInfo(deviceInfo), { headers: headers }).subscribe(function (response) {
resolve();
}, function (error) {
if (error.status == 401) {
......@@ -71,7 +61,7 @@ var Rest = Rest_1 = (function () {
return new Promise(function (resolve, reject) {
var headers = new http_1.Headers();
headers.append('Content-Type', 'application/x-www-form-urlencoded');
_this.http.post(Rest_1.serviceUrl + "/config/heartbeat", _this.prepareDeviceInfo(deviceInfo, false), { headers: headers })
_this.http.post(Rest.serviceUrl + "/config/heartbeat", _this.prepareDeviceInfo(deviceInfo, false), { headers: headers })
.subscribe(function (response) {
resolve(response.json());
}, function (error) {
......@@ -93,7 +83,7 @@ var Rest = Rest_1 = (function () {
var _this = this;
return new Promise(function (resolve, reject) {
if (node && node.IP) {
_this.http.get("http://" + node.IP + ":" + Rest_1.localWebPort + "/device")
_this.http.get("http://" + node.IP + ":" + Rest.localWebPort + "/device")
.timeout(2000)
.subscribe(function (response) {
try {
......@@ -144,10 +134,5 @@ var Rest = Rest_1 = (function () {
}());
Rest.localWebPort = 8320;
Rest.serviceUrl = "http://someurl.com";
Rest = Rest_1 = __decorate([
core_1.Injectable(),
__metadata("design:paramtypes", [http_1.Http])
], Rest);
exports.Rest = Rest;
var Rest_1;
//# sourceMappingURL=rest.js.map
\ No newline at end of file
......
{"version":3,"file":"rest.js","sourceRoot":"","sources":["../../src/services/rest.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
{"version":3,"file":"rest.js","sourceRoot":"","sources":["../../src/services/rest.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
......
import { HttpModule } from '@angular/http';
import { HttpModule, Http } from '@angular/http';
import { NgModule, ModuleWithProviders } from '@angular/core';
import { Rest } from './services/rest';
import { Repository } from './services/repository';
......@@ -8,6 +8,14 @@ export { Rest } from './services/rest';
export { Repository } from './services/repository';
export { Device } from './services/device';
function provideRest(http:Http) : Rest {
return new Rest(http);
}
function provideRepository(rest:Rest) : Repository {
return new Repository(rest, new Device);
}
@NgModule({
imports : [
HttpModule
......@@ -18,9 +26,8 @@ export class DigsigServicesModule {
return {
ngModule: DigsigServicesModule,
providers: [
Rest,
Repository,
Device
{ provide: Rest, useFactory:provideRest, deps:[Http] } ,
{ provide: Repository, useFactory:provideRepository, deps:[Rest] }
]
}
}
......
import {Injectable} from '@angular/core';
import {Rest} from './rest';
import {Device} from './device';
import {DeviceInfo} from '../api/device-info';
......@@ -6,7 +5,6 @@ import {Node} from '../api/node';
declare var emit:any;
@Injectable()
export class Repository {
protected _db:any;
......
import {Injectable} from '@angular/core';
import {Http,Response,Headers} from '@angular/http';
import { DeviceInfo } from './../api/device-info';
import { Node } from './../api/node';
......@@ -8,7 +7,6 @@ export const ERROR_CODE_UNAUTHORIZED:string = "unauthorized";
export const ERROR_CODE_NOT_FOUND:string = "not-found";
export const ERROR_CODE_SERVER_ERROR:string = "server-error";
@Injectable()
export class Rest {
public static localWebPort:number = 8320;
......