corebasic 1.0.226 → 1.0.228

package/dist/libs/elabase.js

@@ -450,10 +450,11 @@ function execute(arg) {
     return config.useDipper ? dipper(arg)
         : axios
             .post(arg.DIP_URL ?? fullurl, buildHybridRequest({ ...arg, DIP_URL: undefined }), { responseType: 'arraybuffer', timeout: timeout ?? 5000, headers: { "Content-Type": "application/dip" } })
-            .then(result => {
+            .then(dip_result => {
             // console.log(res.status);
             // console.log(JSON.stringify(res.header, null, 4));
             // console.log(JSON.stringify(res.body, null, 4));
+            const result = dip_result;
             result.getSliceAsText = (offset, length) => Cpp.getSliceAsText(result.data, offset, length);
             result.getSliceAsArrayBuffer = (offset, length) => Cpp.getSliceAsArrayBuffer(result.data, offset, length);
             result["Content-Type"] = result.headers["content-type"];

package/dist/libs/kafka.js

@@ -14,7 +14,7 @@ export const start = (arg) => {
         clientId: appName,
         brokers: arg?.brokers ?? ['redpanda-0.redpanda.redpanda.svc.cluster.local:9093'], // ['107.155.108.78:9092']     ['127.0.0.1:29092']
         sasl: arg?.sasl == false ? undefined : {
-            mechanism: 'SCRAM-SHA-512',
+            mechanism: 'scram-sha-512', // earlier 'SCRAM-SHA-512'
             username: process.env.KAFKA_USERNAME,
             password: process.env.KAFKA_PASSWORD
         },

package/dist/libs/mobilecodes.js

@@ -50,7 +50,8 @@ export const codes = {
         label: 'Alland Islands',
         phone: '358',
         min: 7,
-        max: 10
+        max: 10,
+        phoneLength: [7, 8, 9, 10], // Custom added by me
     },
     AZ: { code: 'AZ', label: 'Azerbaijan', phone: '994', phoneLength: 9 },
     BA: {
@@ -162,7 +163,7 @@ export const codes = {
     ER: { code: 'ER', label: 'Eritrea', phone: '291', phoneLength: 7 },
     ES: { code: 'ES', label: 'Spain', phone: '34', phoneLength: 9 },
     ET: { code: 'ET', label: 'Ethiopia', phone: '251', phoneLength: 9 },
-    FI: { code: 'FI', label: 'Finland', phone: '358', min: 9, max: 11 },
+    FI: { code: 'FI', label: 'Finland', phone: '358', min: 9, max: 11, phoneLength: [9, 10, 11] }, // Custom added by me
     FJ: { code: 'FJ', label: 'Fiji', phone: '679', phoneLength: 7 },
     FK: {
         code: 'FK',
@@ -247,7 +248,7 @@ export const codes = {
     JE: { code: 'JE', label: 'Jersey', phone: '44', phoneLength: 10 },
     JM: { code: 'JM', label: 'Jamaica', phone: '1-876', phoneLength: 10 },
     JO: { code: 'JO', label: 'Jordan', phone: '962', phoneLength: [8, 9] },
-    JP: { code: 'JP', label: 'Japan', phone: '81', suggested: true },
+    JP: { code: 'JP', label: 'Japan', phone: '81', suggested: true, phoneLength: 11 }, // Custom added by me
     KE: { code: 'KE', label: 'Kenya', phone: '254', phoneLength: 10 },
     KG: { code: 'KG', label: 'Kyrgyzstan', phone: '996', phoneLength: 9 },
     KH: { code: 'KH', label: 'Cambodia', phone: '855', phoneLength: 9 },
@@ -324,7 +325,7 @@ export const codes = {
         phoneLength: 8
     },
     ML: { code: 'ML', label: 'Mali', phone: '223', phoneLength: 8 },
-    MM: { code: 'MM', label: 'Myanmar', phone: '95', min: 7, max: 10 },
+    MM: { code: 'MM', label: 'Myanmar', phone: '95', min: 7, max: 10, phoneLength: [7, 8, 9, 10] }, // Custom added by me
     MN: { code: 'MN', label: 'Mongolia', phone: '976', phoneLength: 8 },
     MO: { code: 'MO', label: 'Macao', phone: '853', phoneLength: 8 },
     MP: {

package/libs/cpp.ts

@@ -180,7 +180,7 @@ export function arrayBufferToString(buffer) {
 
 
 // Matches QString Response::getSliceAsText
-export function getSliceAsText(rawTextBuffer, offset, length) {
+export function getSliceAsText(rawTextBuffer, offset: number, length: number): string {
     // Reuses the identical slice boundary logic from above
     try {
     const slice = getSliceAsArrayBuffer(rawTextBuffer, offset, length);
@@ -191,7 +191,7 @@ export function getSliceAsText(rawTextBuffer, offset, length) {
 }
 
 // Matches QByteArray Response::getSliceAsArrayBuffer
-export function getSliceAsArrayBuffer(rawTextBuffer, offset, length) {
+export function getSliceAsArrayBuffer(rawTextBuffer, offset: number, length: number): Buffer {
     const totalSize = rawTextBuffer.length;
 
     if (offset < 0 || offset >= totalSize) {

package/libs/elabase.ts

@@ -1,5 +1,7 @@
 // @ts-ignore
 import axios from 'axios'
+// @ts-ignore
+import type { AxiosResponse } from "axios";
 import {default as dipper, shard_stats as ShardStats} from './dipper.ts'
 import * as Utils from './utils.ts'
 import * as Cpp from './cpp.ts'
@@ -560,13 +562,22 @@ function execute(arg) {
         return config.useDipper  ? dipper(arg)
         : axios
         .post(arg.DIP_URL ?? fullurl, buildHybridRequest({...arg, DIP_URL: undefined}), { responseType: 'arraybuffer', timeout: timeout ?? 5000, headers: {"Content-Type": "application/dip"} })
-        .then(result => {
+        .then(dip_result => {
             // console.log(res.status);
             // console.log(JSON.stringify(res.header, null, 4));
             // console.log(JSON.stringify(res.body, null, 4));
 
-            result.getSliceAsText = (offset, length) => Cpp.getSliceAsText(result.data, offset, length)
-            result.getSliceAsArrayBuffer = (offset, length) => Cpp.getSliceAsArrayBuffer(result.data, offset, length)
+            type DipResponse = AxiosResponse & {
+                body: any;
+                getSliceAsText(offset: number, length: number): string;
+                getSliceAsArrayBuffer(offset: number, length: number): Buffer;
+                "Content-Type"?: string;
+            };
+
+            const result = dip_result as DipResponse
+
+            result.getSliceAsText = (offset: number, length: number): string => Cpp.getSliceAsText(result.data, offset, length)
+            result.getSliceAsArrayBuffer = (offset: number, length: number): Buffer => Cpp.getSliceAsArrayBuffer(result.data, offset, length)
             result["Content-Type"] = result.headers["content-type"]
             result.body = result.data
             if (result.headers["content-type"].includes("application/json"))

package/libs/kafka.ts

@@ -18,7 +18,7 @@ export const start = (arg) => {
         clientId: appName,
         brokers: arg?.brokers ??  ['redpanda-0.redpanda.redpanda.svc.cluster.local:9093'],   // ['107.155.108.78:9092']     ['127.0.0.1:29092']
         sasl: arg?.sasl == false ? undefined : {
-            mechanism: 'SCRAM-SHA-512',
+            mechanism: 'scram-sha-512', // earlier 'SCRAM-SHA-512'
             username: process.env.KAFKA_USERNAME,
             password: process.env.KAFKA_PASSWORD
         },

package/libs/mobilecodes.ts

@@ -55,7 +55,8 @@ export const codes: Record<string, CountryItem> = {
     label: 'Alland Islands',
     phone: '358',
     min: 7,
-    max: 10
+    max: 10,
+    phoneLength: [7, 8, 9, 10], // Custom added by me
   },
   AZ: { code: 'AZ', label: 'Azerbaijan', phone: '994', phoneLength: 9 },
   BA: {
@@ -167,7 +168,7 @@ export const codes: Record<string, CountryItem> = {
   ER: { code: 'ER', label: 'Eritrea', phone: '291', phoneLength: 7 },
   ES: { code: 'ES', label: 'Spain', phone: '34', phoneLength: 9 },
   ET: { code: 'ET', label: 'Ethiopia', phone: '251', phoneLength: 9 },
-  FI: { code: 'FI', label: 'Finland', phone: '358', min: 9, max: 11 },
+  FI: { code: 'FI', label: 'Finland', phone: '358', min: 9, max: 11, phoneLength: [9, 10, 11] }, // Custom added by me
   FJ: { code: 'FJ', label: 'Fiji', phone: '679', phoneLength: 7 },
   FK: {
     code: 'FK',
@@ -252,7 +253,7 @@ export const codes: Record<string, CountryItem> = {
   JE: { code: 'JE', label: 'Jersey', phone: '44', phoneLength: 10 },
   JM: { code: 'JM', label: 'Jamaica', phone: '1-876', phoneLength: 10 },
   JO: { code: 'JO', label: 'Jordan', phone: '962', phoneLength: [ 8, 9 ] },
-  JP: { code: 'JP', label: 'Japan', phone: '81', suggested: true },
+  JP: { code: 'JP', label: 'Japan', phone: '81', suggested: true, phoneLength: 11 }, // Custom added by me
   KE: { code: 'KE', label: 'Kenya', phone: '254', phoneLength: 10 },
   KG: { code: 'KG', label: 'Kyrgyzstan', phone: '996', phoneLength: 9 },
   KH: { code: 'KH', label: 'Cambodia', phone: '855', phoneLength: 9 },
@@ -329,7 +330,7 @@ export const codes: Record<string, CountryItem> = {
     phoneLength: 8
   },
   ML: { code: 'ML', label: 'Mali', phone: '223', phoneLength: 8 },
-  MM: { code: 'MM', label: 'Myanmar', phone: '95', min: 7, max: 10 },
+  MM: { code: 'MM', label: 'Myanmar', phone: '95', min: 7, max: 10, phoneLength: [7, 8, 9, 10] }, // Custom added by me
   MN: { code: 'MN', label: 'Mongolia', phone: '976', phoneLength: 8 },
   MO: { code: 'MO', label: 'Macao', phone: '853', phoneLength: 8 },
   MP: {

package/libs/session.ts

@@ -78,7 +78,8 @@ export const start = (expressApp, allowedUrls) => {
     app.post("/refreshToken", (req, res) => {
         try {
             let { userId, clientId, refreshToken } = req.body
-            const decoded = jwt.verify(refreshToken, REFRESH_TOKEN_SECRET)
+            type Decoded = {userId: string, clientId: string}
+            const decoded = jwt.verify(refreshToken, REFRESH_TOKEN_SECRET) as Decoded
             if (decoded.userId === userId && decoded.clientId === clientId) {
                 let now = Utils.now()
                 let _accessTokenExpiry = new Date(now); _accessTokenExpiry.setDate(_accessTokenExpiry.getDate() + 1);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "corebasic",
   "type": "module",
-  "version": "1.0.226",
+  "version": "1.0.228",
   "description": "",
   "main": "dist/index.js",
   "types": "./index.ts",