Merge pull request #706 from golemfactory/bugfix/JST-621/fix-yagna-de…

…code-errors JST-621: fix yagna decode errors
golemfactory · Dec 5, 2023 · 36ec7f5 · 36ec7f5
2 parents 8fda1c2 + 4cdf329
commit 36ec7f5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/examples/docs-examples/quickstarts/retrievable-task/task.mjs b/examples/docs-examples/quickstarts/retrievable-task/task.mjs
@@ -1,23 +1,23 @@
-import { GolemNetwork, JobState } from "@golem-sdk/golem-js";
+import { GolemNetwork } from "@golem-sdk/golem-js";
 
 const golem = new GolemNetwork({
-  yagnaOptions: { apiKey: "try_golem" },
+  yagna: { apiKey: "try_golem" },
 });
 await golem.init();
-const job = await golem.createJob(async (ctx) => {
+
+const job = golem.createJob({
+  package: {
+    imageTag: "golem/alpine:latest",
+  },
+});
+job.startWork(async (ctx) => {
   const response = await ctx.run("echo 'Hello, Golem!'");
   return response.stdout;
 });
 
-let state = await job.fetchState();
-while (state === JobState.Pending || state === JobState.New) {
-  console.log("Job is still running...");
-  await new Promise((resolve) => setTimeout(resolve, 1000));
-  state = await job.fetchState();
-}
+const result = await job.waitForResult();
 
-console.log("Job finished with state:", state);
-const result = await job.fetchResults();
+console.log("Job finished with state:", job.state);
 console.log("Job results:", result);
 
 await golem.close();
diff --git a/src/agreement/agreement.ts b/src/agreement/agreement.ts
@@ -58,7 +58,7 @@ export class Agreement {
    * @hidden
    */
   constructor(
-    public readonly id,
+    public readonly id: string,
     public readonly provider: ProviderInfo,
     private readonly yagnaApi: YagnaApi,
     private readonly options: AgreementConfig,

diff --git a/src/job/job.ts b/src/job/job.ts
@@ -186,7 +186,7 @@ export class Job<Output = unknown> {
 
     paymentService.acceptPayments(agreement);
 
-    const activity = await Activity.create(agreement.id, this.yagnaApi, options.activity);
+    const activity = await Activity.create(agreement, this.yagnaApi, options.activity);
 
     const storageProvider =
       this.defaultOptions.work?.storageProvider || options.work?.storageProvider || this._getDefaultStorageProvider();

diff --git a/tests/e2e/express.spec.ts b/tests/e2e/express.spec.ts
@@ -20,7 +20,6 @@ describe("Express", function () {
     const port = 3000;
 
     app.use(express.text());
-    app.listen(port);
 
     app.post("/tts", async (req, res) => {
       if (!req.body) {
@@ -101,13 +100,17 @@ describe("Express", function () {
       expect(statusResponse.status).toEqual(200);
       expect(statusResponse.text === JobState.New || statusResponse.text === JobState.Pending).toBeTruthy();
 
-      await new Promise((resolve) => {
+      await new Promise((resolve, reject) => {
         const interval = setInterval(async () => {
           const statusResponse = await supertest(app).get(`/tts/${jobId}`).set("Content-Type", "text/plain");
           if (statusResponse.text === JobState.Done) {
             clearInterval(interval);
             resolve(undefined);
           }
+          if (statusResponse.text === JobState.Rejected) {
+            clearInterval(interval);
+            reject(new Error("Job rejected"));
+          }
         }, 500);
       });