@dra2020/baseclient 1.0.52 → 1.0.55

package/dist/ot-js/otsession.d.ts

@@ -21,6 +21,7 @@ export declare const FilterTrash: number;
 export declare const FilterPublic: number;
 export declare const FilterOfficial: number;
 export declare const FilterCOI: number;
+export declare const FilterMyGroups: number;
 export declare const FilterCount: number;
 export declare type Filter = number;
 export declare const PermNone: number;
@@ -91,6 +92,7 @@ export interface SessionProps {
     xprops?: {
         [prop: string]: string;
     };
+    groups: any;
 }
 export declare type LabelUpdate = {
     [name: string]: boolean | null;

package/dist/util/bitset.d.ts

@@ -1,10 +1,19 @@
+export interface Converter {
+    atob?: (s: string) => string;
+    btoa?: (s: string) => string;
+}
 export declare class ListToBitset {
     list: string[];
     index: {
         [s: string]: number;
     };
     size: number;
-    constructor(list: string[]);
+    converter: Converter;
+    constructor(list: string[], converter?: Converter);
     toBits(l: string[]): Uint8Array;
     toList(u8: Uint8Array): string[];
+    base64tou8(base64: string): Uint8Array;
+    u8ToBase64(u8: Uint8Array): string;
+    fromBitString(base64: string): string[];
+    toBitString(l: string[]): string;
 }

package/lib/ot-js/otsession.ts

@@ -24,7 +24,8 @@ export const FilterTrash: number = 4;
 export const FilterPublic: number = 5;
 export const FilterOfficial: number = 6;
 export const FilterCOI: number = 7;
-export const FilterCount: number = 8;
+export const FilterMyGroups: number = 8;
+export const FilterCount: number = 9;
 export type Filter = number;
 
 // Permissions
@@ -117,6 +118,7 @@ export interface SessionProps
   expunged?: boolean;
   expungeDate?: string;
   xprops?: { [prop: string]: string };
+  groups: any;  // DT.GroupsMapIndex
 }
 
 // True to add, False to remove

package/lib/util/bitset.ts

@@ -1,21 +1,46 @@
 const BitLookup = [ 1, 2, 4, 8, 16, 32, 64, 128 ];
 
+export interface Converter
+{
+  atob?: (s: string) => string;
+  btoa?: (s: string) => string;
+}
+
+// In NodeJS:
+
+// {
+//  btoa: (s: string) => { return Buffer.from(s, 'binary').toString('base64') },
+//  atob: (s: string) => { return Buffer.from(s, 'base64').toString('binary') },
+// }
+
+// In Browser:
+
+// {
+//  btoa: window.btoa,
+//  atob: window.atob,
+// }
+
 export class ListToBitset
 {
   list: string[];
   index: { [s: string]: number };
   size: number;
+  converter: Converter;
 
-  constructor(list: string[])
+  constructor(list: string[], converter?: Converter)
   {
     this.list = list;
-    this.index = {};
-    this.size = Math.floor((this.list.length+7)/8);
-    this.list.forEach((s: string, i: number) => { this.index[s] = i });
+    this.converter = converter;
   }
 
   toBits(l: string[]): Uint8Array
   {
+    if (! this.index)
+    {
+      this.size = Math.floor((this.list.length+7)/8);
+      this.index = {};
+      this.list.forEach((s: string, i: number) => { this.index[s] = i });
+    }
     let ab = new ArrayBuffer(this.size);
     let u8 = new Uint8Array(ab);
     if (l) l.forEach(s => {
@@ -46,4 +71,35 @@ export class ListToBitset
     }
     return list;
   }
+
+  base64tou8(base64: string): Uint8Array
+  {
+    let raw = this.converter.atob(base64);
+    let rawLength = raw.length;
+    let u8 = new Uint8Array(new ArrayBuffer(rawLength));
+    for (let i = 0; i < rawLength; i++)
+      u8[i] = raw.charCodeAt(i);
+    return u8;
+  }
+
+  u8ToBase64(u8: Uint8Array): string
+  {
+    let binary: string[] = [];
+    let len = u8.byteLength;
+    for (let i = 0; i < len; i++) {
+        binary.push(String.fromCharCode(u8[i]));
+    }
+    return this.converter.btoa(binary.join(''));
+}
+
+  fromBitString(base64: string): string[]
+  {
+    return this.toList(this.base64tou8(base64));
+  }
+
+  toBitString(l: string[]): string
+  {
+    // Note: On server, Buffer.from(this.toBits(l)).toString('base64') probably faster
+    return this.u8ToBase64(this.toBits(l));
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/baseclient",
-  "version": "1.0.52",
+  "version": "1.0.55",
   "description": "Utility functions for Javascript projects.",
   "main": "dist/baseclient.js",
   "types": "./dist/all/all.d.ts",