onecore 0.0.42 → 0.0.44

package/lib/index.js

@@ -32,6 +32,14 @@ var ViewManager = (function () {
   return ViewManager;
 }());
 exports.ViewManager = ViewManager;
+var DefaultViewService = (function (_super) {
+  __extends(DefaultViewService, _super);
+  function DefaultViewService() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+  return DefaultViewService;
+}(ViewManager));
+exports.DefaultViewService = DefaultViewService;
 var ViewSearchManager = (function (_super) {
   __extends(ViewSearchManager, _super);
   function ViewSearchManager(find, repo) {
@@ -86,6 +94,30 @@ var GenericManager = (function (_super) {
   return GenericManager;
 }(ViewManager));
 exports.GenericManager = GenericManager;
+var DefaultGenericService = (function (_super) {
+  __extends(DefaultGenericService, _super);
+  function DefaultGenericService() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+  return DefaultGenericService;
+}(GenericManager));
+exports.DefaultGenericService = DefaultGenericService;
+var DefaultService = (function (_super) {
+  __extends(DefaultService, _super);
+  function DefaultService() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+  return DefaultService;
+}(GenericManager));
+exports.DefaultService = DefaultService;
+var DefaultGenericSearchService = (function (_super) {
+  __extends(DefaultGenericSearchService, _super);
+  function DefaultGenericSearchService() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+  return DefaultGenericSearchService;
+}(GenericManager));
+exports.DefaultGenericSearchService = DefaultGenericSearchService;
 var Manager = (function (_super) {
   __extends(Manager, _super);
   function Manager(find, repo) {
@@ -100,16 +132,20 @@ var Manager = (function (_super) {
   return Manager;
 }(GenericManager));
 exports.Manager = Manager;
-exports.DefaultViewService = ViewManager;
-exports.DefaultGenericService = GenericManager;
-exports.GenericSearchManager = Manager;
-exports.DefaultService = GenericManager;
-exports.DefaultGenericSearchService = GenericManager;
+var GenericSearchManager = (function (_super) {
+  __extends(GenericSearchManager, _super);
+  function GenericSearchManager() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+  return GenericSearchManager;
+}(Manager));
+exports.GenericSearchManager = GenericSearchManager;
 var SavedService = (function () {
-  function SavedService(repository, query, max) {
+  function SavedService(repository, query, max, autoRemove) {
     this.repository = repository;
     this.query = query;
     this.max = max;
+    this.autoRemove = autoRemove;
     this.load = this.load.bind(this);
     this.save = this.save.bind(this);
     this.remove = this.remove.bind(this);
@@ -136,9 +172,17 @@ var SavedService = (function () {
         else {
           items.push(itemId);
           if (items.length > _this.max) {
-            items.shift();
+            if (_this.autoRemove) {
+              items.shift();
+              return _this.repository.update(id, items);
+            }
+            else {
+              return Promise.resolve(-1);
+            }
+          }
+          else {
+            return _this.repository.update(id, items);
           }
-          return _this.repository.update(id, items);
         }
       }
     });
@@ -165,3 +209,11 @@ var SavedService = (function () {
   return SavedService;
 }());
 exports.SavedService = SavedService;
+var SavedManager = (function (_super) {
+  __extends(SavedManager, _super);
+  function SavedManager() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+  return SavedManager;
+}(SavedService));
+exports.SavedManager = SavedManager;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onecore",
-  "version": "0.0.42",
+  "version": "0.0.44",
   "description": "onecore",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/index.ts

@@ -67,6 +67,40 @@ import { ViewService } from './service/ViewService';
 export type Search<T, F> = (s: F, limit?: number, offset?: number | string, fields?: string[]) => Promise<SearchResult<T>>;
 export type SearchFunc<T, F> = Search<T, F>;
 
+export interface KeypairResult {
+  rsaEncrypted: string;
+  data: {
+    shareKey: string;
+    salt: string;
+  };
+}
+export interface CryptoOption {
+  isEncoded64?: boolean;
+  convertKey2Bytes?: boolean;
+}
+export interface CryptoPort {
+  exchangeKeypair: (pk: string) => Promise<KeypairResult>;
+  encryptAESMessage: (aesKey: string, salt: string, dataJSON: string,  options?: CryptoOption) => Promise<string>;
+  decryptAESMessage: <T>(messageEncrypted: string, clientShKey: string, clientSalt: string, options?: CryptoOption) => Promise<T | string>;
+  encrypt: (pk: any, message: string) => string;
+  decrypt: (sk: any, data: string) => string;
+  encryptAES: (key: string, message: string) => string;
+  decryptAES: (key: string, ciphertext: string, iv: string) => string;
+  hashHMAC: (key: string, data: string) => string;
+  hashData: (text: string) => string;
+}
+export interface CryptoService {
+  exchangeKeypair: (pk: string) => Promise<KeypairResult>;
+  encryptAESMessage: (aesKey: string, salt: string, dataJSON: string,  options?: CryptoOption) => Promise<string>;
+  decryptAESMessage: <T>(messageEncrypted: string, clientShKey: string, clientSalt: string, options?: CryptoOption) => Promise<T | string>;
+  encrypt: (pk: any, message: string) => string;
+  decrypt: (sk: any, data: string) => string;
+  encryptAES: (key: string, message: string) => string;
+  decryptAES: (key: string, ciphertext: string, iv: string) => string;
+  hashHMAC: (key: string, data: string) => string;
+  hashData: (text: string) => string;
+}
+
 export interface ExceptionHandler {
   handleException(rs: string, err: any, i?: number, filename?: string): void;
 }
@@ -108,6 +142,10 @@ export class ViewManager<T, ID> implements ViewService<T, ID> {
     return this.r.load(id, ctx);
   }
 }
+// tslint:disable-next-line:max-classes-per-file
+export class DefaultViewService<T, ID> extends ViewManager<T, ID> {
+}
+
 // tslint:disable-next-line:max-classes-per-file
 export class ViewSearchManager<T, ID, F extends Filter> extends ViewManager<T, ID> implements ViewSearchService<T, ID, F> {
   constructor(public find: Search<T, F>, repo: ViewRepository<T, ID>) {
@@ -151,6 +189,15 @@ export class GenericManager<T, ID> extends ViewManager<T, ID> implements Generic
   }
 }
 // tslint:disable-next-line:max-classes-per-file
+export class DefaultGenericService<T, ID> extends GenericManager<T, ID> {
+}
+// tslint:disable-next-line:max-classes-per-file
+export class DefaultService<T, ID> extends GenericManager<T, ID> {
+}
+// tslint:disable-next-line:max-classes-per-file
+export class DefaultGenericSearchService<T, ID> extends GenericManager<T, ID> {
+}
+// tslint:disable-next-line:max-classes-per-file
 export class Manager<T, ID, F extends Filter> extends GenericManager<T, ID> implements GenericSearchService<T, ID, number, F> {
   constructor(public find: Search<T, F>, repo: GenericRepository<T, ID>) {
     super(repo);
@@ -160,11 +207,9 @@ export class Manager<T, ID, F extends Filter> extends GenericManager<T, ID> impl
     return this.find(s, limit, offset, fields);
   }
 }
-export const DefaultViewService = ViewManager;
-export const DefaultGenericService = GenericManager;
-export const GenericSearchManager = Manager;
-export const DefaultService = GenericManager;
-export const DefaultGenericSearchService = GenericManager;
+// tslint:disable-next-line:max-classes-per-file
+export class GenericSearchManager<T, ID, F extends Filter> extends Manager<T, ID, F> {
+}
 export interface SavedRepository<ID> {
   load(id: ID): Promise<string[]|null>;
   insert(id: ID, arr: string[]): Promise<number>;
@@ -172,7 +217,7 @@ export interface SavedRepository<ID> {
 }
 // tslint:disable-next-line:max-classes-per-file
 export class SavedService<ID, T> {
-  constructor(protected repository: SavedRepository<ID>, protected query: (ids: string[]) => Promise<T[]>, public max: number) {
+  constructor(protected repository: SavedRepository<ID>, protected query: (ids: string[]) => Promise<T[]>, public max: number, public autoRemove?: boolean) {
     this.load = this.load.bind(this);
     this.save = this.save.bind(this);
     this.remove = this.remove.bind(this);
@@ -195,9 +240,15 @@ export class SavedService<ID, T> {
         } else {
           items.push(itemId);
           if (items.length > this.max) {
-            items.shift();
+            if (this.autoRemove) {
+              items.shift();
+              return this.repository.update(id, items);
+            } else {
+              return Promise.resolve(-1);
+            }
+          } else {
+            return this.repository.update(id, items);
           }
-          return this.repository.update(id, items);
         }
       }
     });
@@ -219,3 +270,6 @@ export class SavedService<ID, T> {
     });
   }
 }
+// tslint:disable-next-line:max-classes-per-file
+export class SavedManager<ID, T> extends SavedService<ID, T> {
+}

package/src/metadata.ts

@@ -50,6 +50,7 @@ export interface Attribute {
   typeof?: Attributes;
   true?: string|number;
   false?: string|number;
+  noValidate?: boolean;
   getString?: (v: any) => string;
 }
 export interface Attributes {