zkcloudworker 0.8.2 → 0.9.1

package/lib/ts/src/cloud/config.d.ts

@@ -2,5 +2,6 @@ declare const config: {
     MINAFEE: string;
     ZKCLOUDWORKER_AUTH: string;
     ZKCLOUDWORKER_API: string;
+    ZKCLOUDWORKER_NATS: string;
 };
 export default config;

package/lib/ts/src/cloud/config.js

@@ -4,5 +4,6 @@ const config = {
     MINAFEE: "200000000",
     ZKCLOUDWORKER_AUTH: "M6t4jtbBAFFXhLERHQWyEB9JA9xi4cWqmYduaCXtbrFjb7yaY7TyaXDunKDJNiUTBEcyUomNXJgC",
     ZKCLOUDWORKER_API: "https://api.zkcloudworker.com/v1/",
+    ZKCLOUDWORKER_NATS: "http://cloud.zkcloudworker.com:4222",
 };
 exports.default = config;

package/lib/{web/src/cloud/utils/hash.d.ts → ts/src/cloud/utils/base64.d.ts}

@@ -1,4 +1,3 @@
-export declare function stringHash(jsonString: string): string;
 export declare function bigintToBase56(value: bigint): string;
 export declare function bigintFromBase56(str: string): bigint;
 export declare function bigintToBase64(value: bigint): string;

package/lib/ts/src/cloud/utils/{hash.js → base64.js}

@@ -1,16 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toBase = exports.fromBase = exports.bigintFromBase64 = exports.bigintToBase64 = exports.bigintFromBase56 = exports.bigintToBase56 = exports.stringHash = void 0;
-const crypto_1 = __importDefault(require("crypto"));
-function stringHash(jsonString) {
-    if (typeof jsonString !== "string")
-        throw new Error("stringHash: input must be a string");
-    return bigintToBase56(BigInt("0x" + crypto_1.default.createHash("sha256").update(jsonString).digest("hex")));
-}
-exports.stringHash = stringHash;
+exports.toBase = exports.fromBase = exports.bigintFromBase64 = exports.bigintToBase64 = exports.bigintFromBase56 = exports.bigintToBase56 = void 0;
 // URL friendly base64 encoding
 const TABLE = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
 function bigintToBase56(value) {

package/lib/ts/src/cloud/utils/index.d.ts

@@ -1,4 +1,3 @@
-export * from "./files";
 export * from "./graphql";
 export * from "./utils";
-export * from "./hash";
+export * from "./base64";

package/lib/ts/src/cloud/utils/index.js

@@ -14,7 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./files"), exports);
 __exportStar(require("./graphql"), exports);
 __exportStar(require("./utils"), exports);
-__exportStar(require("./hash"), exports);
+__exportStar(require("./base64"), exports);

package/lib/ts/src/cloud/worker/job.d.ts

@@ -18,40 +18,37 @@ export interface LogStream {
     logStreamName: string;
     awsRequestId: string;
 }
+/**
+ * @param logStreams the log streams of the job
+ * @param logs the logs of the job
+ * @param isFullLog whether the logs are full
+ */
+export interface JobLogs {
+    logStreams?: LogStream[];
+    logs?: string[];
+    isFullLog?: boolean;
+}
 /**
  * JobData is the data structure for a job, keeping track of the job status, result, logs, and metadata
  * @param id the id of the user
  * @param jobId the id of the job
  * @param taskId the id of the task
+ *
  * @param developer the developer of the repo executing the job
  * @param repo the repo executing the job
+ *
  * @param task the task to execute
  * @param userId the id of the user
  * @param args the arguments for the job
  * @param metadata the metadata for the job
  * @param chain the blockchain to execute the job on
- * @param webhook the webhook to call after the job finishes
- * @param cloudhook the cloudhook to call after the job finishes
- * @param cloudIteration the recursive call number, must be less than 5
- * @param previousJob the previous job data, provided in case of the cloudhook
- *
  * @param filename the filename where transactions data is stored
  * @param txNumber the number of transactions
  * @param timeCreated the time the job was created
- * @param timeCreatedString the time the job was created as a string
  * @param timeStarted the time the job was started
  * @param timeFinished the time the job was finished
  * @param timeFailed the time the job failed
  * @param timeUsed the time the job result was used
- * @param billedDuration the duration the job was billed for
- * @param feeMINA the fee in MINA
- * @param feeUSD the fee in USD
- * @param jobStatus the status of the job
- * @param maxAttempts the maximum number of attempts
- * @param result the result of the job
- * @param logStreams the log streams of the job
- * @param logs the logs of the job
- * @param isFullLog whether the logs are full
  */
 export interface JobData {
     id: string;
@@ -64,25 +61,28 @@ export interface JobData {
     args?: string;
     metadata?: string;
     chain: blockchain;
-    webhook?: string;
-    cloudhook?: string;
-    cloudIteration?: number;
-    previousJob?: JobData;
     filename?: string;
     txNumber: number;
     timeCreated: number;
-    timeCreatedString: string;
     timeStarted?: number;
     timeFinished?: number;
     timeFailed?: number;
     timeUsed?: number;
+    jobStatus: JobStatus;
     billedDuration?: number;
-    feeMINA?: number;
-    feeUSD?: number;
+    result?: string;
+}
+/**
+ * JobData is the data structure for a job, keeping track of the job status, result, logs, and metadata
+ * @param jobId the id of the job
+ * @param eventTime the time the event occurred
+ * @param jobStatus the status of the job
+ * @param billedDuration the duration the job was billed for
+ * @param result the result of the job
+ */
+export interface JobEvent {
+    jobId: string;
+    eventTime: number;
     jobStatus: JobStatus;
-    maxAttempts: number;
     result?: string;
-    logStreams?: LogStream[];
-    logs?: string[];
-    isFullLog?: boolean;
 }

package/lib/ts/src/mina/api/api.js

@@ -381,7 +381,10 @@ class zkCloudWorkerClient {
                         localWorker: this.localWorker,
                     });
                     if (data.mode === "sync")
-                        return { success: true, data: local_1.LocalStorage.jobs[jobId].result };
+                        return {
+                            success: true,
+                            data: local_1.LocalStorage.jobEvents[jobId].result,
+                        };
                     else
                         return {
                             success: true,

package/lib/ts/src/mina/local/local.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { Cloud, zkCloudWorker } from "../../cloud";
-import { JobData } from "../../cloud";
+import { JobData, JobEvent } from "../../cloud";
 import { TaskData } from "../../cloud";
 import { blockchain } from "../../cloud";
 import { CloudTransaction, DeployerKeyPair } from "../../cloud";
@@ -234,6 +234,9 @@ export declare class LocalStorage {
     static jobs: {
         [key: string]: JobData;
     };
+    static jobEvents: {
+        [key: string]: JobEvent;
+    };
     static data: {
         [key: string]: string;
     };

package/lib/ts/src/mina/local/local.js

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LocalStorage = exports.LocalCloud = void 0;
 const cloud_1 = require("../../cloud");
 const cloud_2 = require("../../cloud");
-const cloud_3 = require("../../cloud");
-const cloud_4 = require("../../cloud");
 /**
  * LocalCloud is a cloud that runs on the local machine for testing and development
  * It uses LocalStorage to store jobs, tasks, transactions, and data
@@ -94,7 +92,8 @@ class LocalCloud extends cloud_1.Cloud {
      * @param value the value to save
      */
     async saveFile(filename, value) {
-        await (0, cloud_3.saveBinaryFile)({ data: value, filename });
+        throw new Error("Method not implemented.");
+        //await saveBinaryFile({ data: value, filename });
     }
     /**
      * Loads the file
@@ -102,8 +101,9 @@ class LocalCloud extends cloud_1.Cloud {
      * @returns the file data
      */
     async loadFile(filename) {
-        const data = await (0, cloud_3.loadBinaryFile)(filename);
-        return data;
+        throw new Error("Method not implemented.");
+        //const data = await loadBinaryFile(filename);
+        //return data;
     }
     /**
      * Loads the environment
@@ -117,8 +117,10 @@ class LocalCloud extends cloud_1.Cloud {
      * @returns generated unique id
      */
     static generateId(tx = undefined) {
-        const data = tx ?? JSON.stringify({ time: Date.now(), data: (0, cloud_2.makeString)(32) });
-        return (0, cloud_4.stringHash)(data);
+        //const data =
+        //  tx ?? JSON.stringify({ time: Date.now(), data: makeString(32) });
+        //return stringHash(data);
+        return Date.now() + "." + (0, cloud_2.makeString)(32);
     }
     /**
      * Send transactions to the local cloud
@@ -195,10 +197,8 @@ class LocalCloud extends cloud_1.Cloud {
             metadata,
             txNumber: command === "recursiveProof" ? transactions.length : 1,
             timeCreated,
-            timeCreatedString: new Date(timeCreated).toISOString(),
             timeStarted: timeCreated,
-            jobStatus: "started",
-            maxAttempts: 0,
+            chain,
         };
         const cloud = new LocalCloud({
             job,
@@ -218,15 +218,22 @@ class LocalCloud extends cloud_1.Cloud {
                 : undefined;
         const timeFinished = Date.now();
         if (result !== undefined) {
-            job.jobStatus = "finished";
+            LocalStorage.jobEvents[jobId] = {
+                jobId,
+                jobStatus: "finished",
+                eventTime: timeFinished,
+                result,
+            };
             job.timeFinished = timeFinished;
-            job.result = result;
         }
         else {
-            job.jobStatus = "failed";
+            LocalStorage.jobEvents[jobId] = {
+                jobId,
+                jobStatus: "failed",
+                eventTime: timeFinished,
+            };
             job.timeFailed = timeFinished;
         }
-        job.maxAttempts = 1;
         job.billedDuration = timeFinished - timeCreated;
         LocalStorage.jobs[jobId] = job;
         return jobId;
@@ -362,10 +369,6 @@ class LocalCloud extends cloud_1.Cloud {
                 metadata: data.metadata,
                 txNumber: 1,
                 timeCreated: timeCreated,
-                timeCreatedString: new Date(timeCreated).toISOString(),
-                timeStarted: Date.now(),
-                jobStatus: "started",
-                maxAttempts: 0,
             };
             const cloud = new LocalCloud({
                 job,
@@ -374,16 +377,25 @@ class LocalCloud extends cloud_1.Cloud {
             });
             const worker = await localWorker(cloud);
             const result = await worker.task();
-            job.timeFinished = Date.now();
-            job.maxAttempts = 1;
-            job.billedDuration = job.timeFinished - timeCreated;
+            const timeFinished = Date.now();
             if (result !== undefined) {
-                job.jobStatus = "finished";
-                job.result = result;
+                LocalStorage.jobEvents[jobId] = {
+                    jobId,
+                    jobStatus: "finished",
+                    eventTime: timeFinished,
+                    result,
+                };
+                job.timeFinished = timeFinished;
             }
             else {
-                job.jobStatus = "failed";
+                LocalStorage.jobEvents[jobId] = {
+                    jobId,
+                    jobStatus: "failed",
+                    eventTime: timeFinished,
+                };
+                job.timeFailed = timeFinished;
             }
+            job.billedDuration = timeFinished - timeCreated;
             LocalStorage.jobs[jobId] = job;
         }
         let count = 0;
@@ -442,6 +454,7 @@ class LocalStorage {
      * @param name the name to save the data
      */
     static async saveData(name) {
+        throw new Error("Method not implemented.");
         const data = {
             jobs: LocalStorage.jobs,
             data: LocalStorage.data,
@@ -449,25 +462,28 @@ class LocalStorage {
             tasks: LocalStorage.tasks,
         };
         const filename = name + ".cloud";
-        await (0, cloud_3.saveFile)({ data, filename });
+        //await saveFile({ data, filename });
     }
     /**
      * Loads the data
      * @param name the name to load the data
      */
     static async loadData(name) {
+        throw new Error("Method not implemented.");
         const filename = name + ".cloud";
-        const data = await (0, cloud_3.loadFile)(filename);
-        if (data === undefined)
-            return;
+        /*
+        const data = await loadFile(filename);
+        if (data === undefined) return;
         LocalStorage.jobs = data.jobs;
         LocalStorage.data = data.data;
         LocalStorage.transactions = data.transactions;
         LocalStorage.tasks = data.tasks;
+        */
     }
 }
 exports.LocalStorage = LocalStorage;
 LocalStorage.jobs = {};
+LocalStorage.jobEvents = {};
 LocalStorage.data = {};
 LocalStorage.transactions = {};
 LocalStorage.tasks = {};

package/lib/ts/src/mina/utils/base64.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fieldFromBase64 = exports.fieldToBase64 = exports.fieldFromBase56 = exports.fieldToBase56 = void 0;
 const o1js_1 = require("o1js");
-const hash_1 = require("../../cloud/utils/hash");
+const base64_1 = require("../../cloud/utils/base64");
 // URL friendly base64 encoding
 const TABLE = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
 function fieldToBase56(field) {
-    const digits = (0, hash_1.toBase)(field.toBigInt(), 56n);
+    const digits = (0, base64_1.toBase)(field.toBigInt(), 56n);
     //console.log("digits:", digits);
     const str = digits.map((x) => TABLE[Number(x)]).join("");
     //console.log("str:", str);
@@ -15,12 +15,12 @@ function fieldToBase56(field) {
 exports.fieldToBase56 = fieldToBase56;
 function fieldFromBase56(str) {
     const base56Digits = str.split("").map((x) => BigInt(TABLE.indexOf(x)));
-    const x = (0, hash_1.fromBase)(base56Digits, 56n);
+    const x = (0, base64_1.fromBase)(base56Digits, 56n);
     return (0, o1js_1.Field)(x);
 }
 exports.fieldFromBase56 = fieldFromBase56;
 function fieldToBase64(field) {
-    const digits = (0, hash_1.toBase)(field.toBigInt(), 64n);
+    const digits = (0, base64_1.toBase)(field.toBigInt(), 64n);
     //console.log("digits:", digits);
     const str = digits.map((x) => TABLE[Number(x)]).join("");
     //console.log("str:", str);
@@ -29,7 +29,7 @@ function fieldToBase64(field) {
 exports.fieldToBase64 = fieldToBase64;
 function fieldFromBase64(str) {
     const base64Digits = str.split("").map((x) => BigInt(TABLE.indexOf(x)));
-    const x = (0, hash_1.fromBase)(base64Digits, 64n);
+    const x = (0, base64_1.fromBase)(base64Digits, 64n);
     return (0, o1js_1.Field)(x);
 }
 exports.fieldFromBase64 = fieldFromBase64;