@prosopo/provider 0.1.18 → 0.1.19

package/dist/util.d.ts

@@ -0,0 +1,28 @@
+import { Captcha, CaptchaSolution, ScheduledTaskNames } from '@prosopo/types';
+import { Database } from '@prosopo/types-database';
+import { Logger } from '@prosopo/common';
+import pl from 'nodejs-polars';
+export declare function encodeStringAddress(address: string): string;
+export declare function shuffleArray<T>(array: T[]): T[];
+type PromiseQueueRes<T> = {
+    data?: T;
+    error?: Error;
+}[];
+/**
+ * Executes promises in order
+ * @param array - array of promises
+ * @returns PromiseQueueRes\<T\>
+ */
+export declare function promiseQueue<T>(array: (() => Promise<T>)[]): Promise<PromiseQueueRes<T>>;
+export declare function parseBlockNumber(blockNumberString: string): number;
+export declare function calculateNewSolutions(solutions: CaptchaSolution[], winningNumberOfSolutions: number): pl.DataFrame;
+export declare function updateSolutions(solutions: pl.DataFrame, captchas: Captcha[], logger: Logger): Captcha[];
+/**
+ * Check if there is a batch running.
+ * If the batch task is running and not completed, return true.
+ * If the batch task is running and completed, return false.
+ * Otherwise, the batch task is not running, return false.
+ */
+export declare function checkIfTaskIsRunning(taskName: ScheduledTaskNames, db: Database): Promise<boolean>;
+export {};
+//# sourceMappingURL=util.d.ts.map

package/dist/util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAuB,MAAM,gBAAgB,CAAA;AAClG,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAClD,OAAO,EAAE,MAAM,EAAmB,MAAM,iBAAiB,CAAA;AAKzD,OAAO,EAAE,MAAM,eAAe,CAAA;AAE9B,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,UAOlD;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAQ/C;AAED,KAAK,eAAe,CAAC,CAAC,IAAI;IACtB,IAAI,CAAC,EAAE,CAAC,CAAA;IACR,KAAK,CAAC,EAAE,KAAK,CAAA;CAChB,EAAE,CAAA;AAEH;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAmB9F;AAED,wBAAgB,gBAAgB,CAAC,iBAAiB,EAAE,MAAM,UAEzD;AAED,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,eAAe,EAAE,EAAE,wBAAwB,EAAE,MAAM,gBAcnG;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,EAAE,CAuBvG;AAED;;;;;GAKG;AACH,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,EAAE,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,CAOvG"}

package/dist/util.js

@@ -0,0 +1,117 @@
+// Copyright 2021-2023 Prosopo (UK) Ltd.
+//
+// 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.
+import { ScheduledTaskStatus } from '@prosopo/types';
+import { ProsopoEnvError } from '@prosopo/common';
+import { arrayJoin } from '@prosopo/common';
+import { at } from '@prosopo/util';
+import { decodeAddress, encodeAddress } from '@polkadot/keyring';
+import { hexToU8a, isHex } from '@polkadot/util';
+import pl from 'nodejs-polars';
+export function encodeStringAddress(address) {
+    try {
+        return encodeAddress(isHex(address) ? hexToU8a(address) : decodeAddress(address));
+    }
+    catch (error) {
+        // TODO fix error handling
+        throw new ProsopoEnvError(error, 'CONTRACT.INVALID_ADDRESS', {}, address);
+    }
+}
+export function shuffleArray(array) {
+    for (let arrayIndex = array.length - 1; arrayIndex > 0; arrayIndex--) {
+        const randIndex = Math.floor(Math.random() * (arrayIndex + 1));
+        const tmp = at(array, randIndex, { required: false });
+        array[randIndex] = at(array, arrayIndex, { required: false });
+        array[arrayIndex] = tmp;
+    }
+    return array;
+}
+/**
+ * Executes promises in order
+ * @param array - array of promises
+ * @returns PromiseQueueRes\<T\>
+ */
+export async function promiseQueue(array) {
+    const ret = [];
+    await [...array, () => Promise.resolve(undefined)].reduce((promise, curr, i) => {
+        return promise
+            .then((res) => {
+            // first iteration has no res (initial reduce result)
+            if (res) {
+                ret.push({ data: res });
+            }
+            return curr();
+        })
+            .catch((err) => {
+            ret.push({ data: err });
+            return curr();
+        });
+    }, Promise.resolve(undefined));
+    return ret;
+}
+export function parseBlockNumber(blockNumberString) {
+    return parseInt(blockNumberString.replace(/,/g, ''));
+}
+export function calculateNewSolutions(solutions, winningNumberOfSolutions) {
+    if (solutions.length === 0) {
+        return pl.DataFrame([]);
+    }
+    const solutionsNoEmptyArrays = solutions.map(({ solution, ...otherAttrs }) => {
+        return { solutionKey: arrayJoin(solution, ','), ...otherAttrs };
+    });
+    let df = pl.readRecords(solutionsNoEmptyArrays);
+    df = df.drop('salt');
+    const group = df.groupBy(['captchaId', 'solutionKey']).agg(pl.count('captchaContentId').alias('count'));
+    const filtered = group.filter(pl.col('count').gt(winningNumberOfSolutions));
+    // TODO is below correct? 'solutionKey' does not exist in the type
+    const key = filtered['solutionKey'];
+    return filtered.withColumn(key.str.split(',').rename('solution'));
+}
+export function updateSolutions(solutions, captchas, logger) {
+    // Note - loading the dataset in nodejs-polars doesn't work because of nested objects, which is why this is done in
+    // a map instead of a join
+    return captchas.map((captcha) => {
+        // try to find the solution in the solutions dataframe
+        if (!captcha.solution) {
+            try {
+                const captchaSolutions = [
+                    // TODO is below correct? 'solution' is not in the type
+                    ...solutions.filter(pl.col('captchaId').eq(pl.lit(captcha.captchaId)))['solution'].values(),
+                ];
+                if (captchaSolutions.length > 0) {
+                    captcha.solution = captchaSolutions[0];
+                    captcha.solved = true;
+                }
+            }
+            catch {
+                logger.debug('No solution found for captchaId', captcha.captchaId);
+            }
+        }
+        return captcha;
+    });
+}
+/**
+ * Check if there is a batch running.
+ * If the batch task is running and not completed, return true.
+ * If the batch task is running and completed, return false.
+ * Otherwise, the batch task is not running, return false.
+ */
+export async function checkIfTaskIsRunning(taskName, db) {
+    const runningTask = await db.getLastScheduledTaskStatus(taskName, ScheduledTaskStatus.Running);
+    if (runningTask) {
+        const completedTask = await db.getScheduledTaskStatus(runningTask.taskId, ScheduledTaskStatus.Completed);
+        return !completedTask;
+    }
+    return false;
+}
+//# sourceMappingURL=util.js.map

package/dist/util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@prosopo/provider",
-    "version": "0.1.18",
+    "version": "0.1.19",
     "author": "PROSOPO LIMITED <info@prosopo.io>",
     "license": "Apache-2.0",
     "main": "./dist/index.js",
@@ -23,14 +23,14 @@
         "@polkadot/types": "10.9.1",
         "@polkadot/util": "12.3.2",
         "@polkadot/util-crypto": "12.3.2",
-        "@prosopo/common": "^0.1.18",
-        "@prosopo/contract": "^0.1.18",
-        "@prosopo/database": "^0.1.18",
-        "@prosopo/datasets": "^0.1.18",
-        "@prosopo/env": "^0.1.18",
-        "@prosopo/types": "^0.1.18",
-        "@prosopo/types-database": "^0.1.18",
-        "@prosopo/types-env": "^0.1.18",
+        "@prosopo/common": "^0.1.19",
+        "@prosopo/contract": "^0.1.19",
+        "@prosopo/database": "^0.1.19",
+        "@prosopo/datasets": "^0.1.19",
+        "@prosopo/env": "^0.1.19",
+        "@prosopo/types": "^0.1.19",
+        "@prosopo/types-database": "^0.1.19",
+        "@prosopo/types-env": "^0.1.19",
         "cron": "^2.1.0",
         "cron-parser": "^4.5.0",
         "express": "^4.18.1",

package/Dockerfile

@@ -1,12 +0,0 @@
-FROM node:16
-
-WORKDIR /usr/src/app
-
-COPY . ./
-
-RUN npm i
-RUN npm run build:config -- ./tsconfig.docker.json
-
-EXPOSE 3000
-
-ENTRYPOINT [ "npm", "run", "serve" ]